NginxProxyManager/docker-nginx-full
1
0
Fork 0
mirror of https://github.com/NginxProxyManager/docker-nginx-full.git synced 2026-05-18 07:40:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix node base, remove golang from master branch

Browse Source
This commit is contained in:
Jamie Curnow
2021-08-17 11:25:10 +10:00
parent 2e5a064014
commit bebe2338a6
3 changed files with 1 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.jenkins/Jenkinsfile
Vendored
-14
View File
@@ -31,7 +31,6 @@ pipeline {
env.BASE_TAG = 'latest'
env.BUILDX_PUSH_TAGS = "-t docker.io/nginxproxymanager/${IMAGE}:${BASE_TAG}"
env.BUILDX_PUSH_TAGS_NODE = "-t docker.io/nginxproxymanager/${IMAGE}:node"
env.BUILDX_PUSH_TAGS_GOLANG = "-t docker.io/nginxproxymanager/${IMAGE}:golang"
}
}
}
@@ -47,7 +46,6 @@ pipeline {
env.BASE_TAG = "github-${BRANCH_LOWER}"
env.BUILDX_PUSH_TAGS = "-t docker.io/nginxproxymanager/${IMAGE}:${BASE_TAG}"
env.BUILDX_PUSH_TAGS_NODE = "${BUILDX_PUSH_TAGS}-node"
env.BUILDX_PUSH_TAGS_GOLANG = "${BUILDX_PUSH_TAGS}-golang"
}
}
}
@@ -66,17 +64,6 @@ pipeline {
}
stage('Other Builds') {
parallel {
stage('Golang') {
environment {
BUILDX_NAME = "${IMAGE}_${GIT_BRANCH}_golang"
}
steps {
withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'DOCKER_PASS', usernameVariable: 'DOCKER_USER')]) {
sh 'docker login -u "${DOCKER_USER}" -p "${DOCKER_PASS}"'
sh "./scripts/buildx --push -f docker/Dockerfile.golang ${BUILDX_PUSH_TAGS_GOLANG}"
}
}
}
stage('Node') {
environment {
BUILDX_NAME = "${IMAGE}_${GIT_BRANCH}_node"
@@ -105,7 +92,6 @@ pipeline {
- `nginxproxymanager/${IMAGE}:github-${BRANCH_LOWER}`
- `nginxproxymanager/${IMAGE}:github-${BRANCH_LOWER}-node`
- `nginxproxymanager/${IMAGE}:github-${BRANCH_LOWER}-golang`
""")
}
}
docker/Dockerfile.golang
-29
View File
@@ -1,29 +0,0 @@
FROM golang:latest as go
FROM jc21/nginx-full:${BASE_TAG:-latest}
ARG TARGETPLATFORM
RUN echo "Golang: jc21/nginx-full:${BASE_TAG:-latest}, ${TARGETPLATFORM:-linux/amd64}" >> /built-for-arch
LABEL maintainer="Jamie Curnow <jc@jc21.com>"
RUN apt-get update \
&& apt-get install -y wget gcc g++ make git sqlite3 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
# copy go from golang
COPY --from=go /usr/local/go /usr/local/go
ENV GOPATH=/opt/go PATH="/usr/local/go/bin:$PATH:/opt/go/bin"
RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" \
&& chmod -R 777 "$GOPATH" \
&& echo "====> ${TARGETPLATFORM}: $(go version)"
WORKDIR /root
# Gotools
RUN if [ "$TARGETPLATFORM" == "" ] || [ "$TARGETPLATFORM" == "linux/amd64" ]; then cd /usr && wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.39.0; fi
RUN go get -u github.com/kyoh86/richgo \
&& rm -rf /root/.cache/go-build
docker/Dockerfile.node
+1 -1
View File
@@ -1,4 +1,4 @@
FROM jc21/nginx-full:${BASE_TAG:-latest}
FROM nginxproxymanager/nginx-full:${BASE_TAG:-latest}
LABEL maintainer="Jamie Curnow <jc@jc21.com>"
ARG TARGETPLATFORM