Skip to content

Commit bebe233

Browse files
committed
Fix node base, remove golang from master branch
1 parent 2e5a064 commit bebe233

File tree

3 files changed

+1
-44
lines changed

3 files changed

+1
-44
lines changed

.jenkins/Jenkinsfile

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ pipeline {
3131
env.BASE_TAG = 'latest'
3232
env.BUILDX_PUSH_TAGS = "-t docker.io/nginxproxymanager/${IMAGE}:${BASE_TAG}"
3333
env.BUILDX_PUSH_TAGS_NODE = "-t docker.io/nginxproxymanager/${IMAGE}:node"
34-
env.BUILDX_PUSH_TAGS_GOLANG = "-t docker.io/nginxproxymanager/${IMAGE}:golang"
3534
}
3635
}
3736
}
@@ -47,7 +46,6 @@ pipeline {
4746
env.BASE_TAG = "github-${BRANCH_LOWER}"
4847
env.BUILDX_PUSH_TAGS = "-t docker.io/nginxproxymanager/${IMAGE}:${BASE_TAG}"
4948
env.BUILDX_PUSH_TAGS_NODE = "${BUILDX_PUSH_TAGS}-node"
50-
env.BUILDX_PUSH_TAGS_GOLANG = "${BUILDX_PUSH_TAGS}-golang"
5149
}
5250
}
5351
}
@@ -66,17 +64,6 @@ pipeline {
6664
}
6765
stage('Other Builds') {
6866
parallel {
69-
stage('Golang') {
70-
environment {
71-
BUILDX_NAME = "${IMAGE}_${GIT_BRANCH}_golang"
72-
}
73-
steps {
74-
withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'DOCKER_PASS', usernameVariable: 'DOCKER_USER')]) {
75-
sh 'docker login -u "${DOCKER_USER}" -p "${DOCKER_PASS}"'
76-
sh "./scripts/buildx --push -f docker/Dockerfile.golang ${BUILDX_PUSH_TAGS_GOLANG}"
77-
}
78-
}
79-
}
8067
stage('Node') {
8168
environment {
8269
BUILDX_NAME = "${IMAGE}_${GIT_BRANCH}_node"
@@ -105,7 +92,6 @@ pipeline {
10592
10693
- `nginxproxymanager/${IMAGE}:github-${BRANCH_LOWER}`
10794
- `nginxproxymanager/${IMAGE}:github-${BRANCH_LOWER}-node`
108-
- `nginxproxymanager/${IMAGE}:github-${BRANCH_LOWER}-golang`
10995
""")
11096
}
11197
}

docker/Dockerfile.golang

Lines changed: 0 additions & 29 deletions
This file was deleted.

docker/Dockerfile.node

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM jc21/nginx-full:${BASE_TAG:-latest}
1+
FROM nginxproxymanager/nginx-full:${BASE_TAG:-latest}
22
LABEL maintainer="Jamie Curnow <[email protected]>"
33

44
ARG TARGETPLATFORM

0 commit comments

Comments
 (0)