ThatGuyJack/nginx-proxy-manager
1
0
Fork 0
mirror of https://github.com/NginxProxyManager/nginx-proxy-manager.git synced 2025-10-30 23:33:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Complete the removal of Sentry

Browse Source
This commit is contained in:
Jamie Curnow
2023-07-24 14:41:46 +10:00
parent aae95798b2
commit fd277973cd
6 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Jenkinsfile vendored
View File

@@ -75,22 +75,20 @@ pipeline {
} }
stage('Backend') { stage('Backend') {
steps { steps {
withCredentials([string(credentialsId: 'npm-sentry-dsn', variable: 'SENTRY_DSN')]) { withCredentials([usernamePassword(credentialsId: 'oss-index-token', passwordVariable: 'NANCY_TOKEN', usernameVariable: 'NANCY_USER')]) {
withCredentials([usernamePassword(credentialsId: 'oss-index-token', passwordVariable: 'NANCY_TOKEN', usernameVariable: 'NANCY_USER')]) { sh './scripts/ci/test-backend'
sh './scripts/ci/test-backend'
}
// Build all the golang binaries
sh './scripts/ci/build-backend'
// Build the docker image used for testing below
sh '''docker build --pull --no-cache \\
-t "${IMAGE}:${BRANCH_LOWER}-ci-${BUILD_NUMBER}" \\
-f docker/Dockerfile \\
--build-arg BUILD_COMMIT="${BUILD_COMMIT}" \\
--build-arg BUILD_DATE="$(date '+%Y-%m-%d %T %Z')" \\
--build-arg BUILD_VERSION="${BUILD_VERSION}" \\
.
'''
} }
// Build all the golang binaries
sh './scripts/ci/build-backend'
// Build the docker image used for testing below
sh '''docker build --pull --no-cache \\
-t "${IMAGE}:${BRANCH_LOWER}-ci-${BUILD_NUMBER}" \\
-f docker/Dockerfile \\
--build-arg BUILD_COMMIT="${BUILD_COMMIT}" \\
--build-arg BUILD_DATE="$(date '+%Y-%m-%d %T %Z')" \\
--build-arg BUILD_VERSION="${BUILD_VERSION}" \\
.
'''
} }
post { post {
success { success {
@@ -215,12 +213,10 @@ pipeline {
} }
} }
steps { steps {
withCredentials([string(credentialsId: 'npm-sentry-dsn', variable: 'SENTRY_DSN')]) { withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) { sh 'docker login -u "${duser}" -p "${dpass}"'
sh 'docker login -u "${duser}" -p "${dpass}"' sh "./scripts/buildx --push ${buildxPushTags}"
sh "./scripts/buildx --push ${buildxPushTags}" // sh './scripts/buildx -o type=local,dest=docker-build'
// sh './scripts/buildx -o type=local,dest=docker-build'
}
} }
} }
} }

4
docker/Dockerfile
View File

@@ -14,14 +14,12 @@ ARG BUILD_COMMIT
ARG BUILD_VERSION ARG BUILD_VERSION
ARG GOPRIVATE ARG GOPRIVATE
ARG GOPROXY ARG GOPROXY
ARG SENTRY_DSN
ENV BUILD_COMMIT="${BUILD_COMMIT:-dev}" \ ENV BUILD_COMMIT="${BUILD_COMMIT:-dev}" \
BUILD_VERSION="${BUILD_VERSION:-0.0.0}" \ BUILD_VERSION="${BUILD_VERSION:-0.0.0}" \
CGO_ENABLED=0 \ CGO_ENABLED=0 \
GOPRIVATE="${GOPRIVATE:-}" \ GOPRIVATE="${GOPRIVATE:-}" \
GOPROXY="${GOPROXY:-}" \ GOPROXY="${GOPROXY:-}"
SENTRY_DSN="${SENTRY_DSN:-}"
COPY scripts /scripts COPY scripts /scripts
COPY backend /app COPY backend /app

1
scripts/buildx
View File

@@ -24,7 +24,6 @@ docker buildx build \
--build-arg SKIP_TESTS=1 \ --build-arg SKIP_TESTS=1 \
--build-arg GOPRIVATE="${GOPRIVATE:-}" \ --build-arg GOPRIVATE="${GOPRIVATE:-}" \
--build-arg GOPROXY="${GOPROXY:-}" \ --build-arg GOPROXY="${GOPROXY:-}" \
--build-arg SENTRY_DSN="${SENTRY_DSN:-}" \
--platform linux/amd64,linux/arm64,linux/arm/7 \ --platform linux/amd64,linux/arm64,linux/arm/7 \
--progress plain \ --progress plain \
--pull \ --pull \

2
scripts/ci/build-backend
View File

@@ -60,7 +60,7 @@ build_backend() {
go build \ go build \
-tags 'json1' \ -tags 'json1' \
-buildvcs=false \ -buildvcs=false \
-ldflags "-w -s -X main.commit=${BUILD_COMMIT:-notset} -X main.version=${BUILD_VERSION} -X main.sentryDSN=${SENTRY_DSN:-}" \ -ldflags "-w -s -X main.commit=${BUILD_COMMIT:-notset} -X main.version=${BUILD_VERSION}" \
-o "/app/bin/$FILENAME" \ -o "/app/bin/$FILENAME" \
./cmd/server ./cmd/server
} }

1
scripts/ci/test-backend
View File

@@ -58,7 +58,6 @@ else
-e GOPRIVATE="${GOPRIVATE:-}" \ -e GOPRIVATE="${GOPRIVATE:-}" \
-e GOPROXY="${GOPROXY:-}" \ -e GOPROXY="${GOPROXY:-}" \
-e NOW="$NOW" \ -e NOW="$NOW" \
-e SENTRY_DSN="${SENTRY_DSN:-}" \
-e TZ="${TZ:-Australia/Brisbane}" \ -e TZ="${TZ:-Australia/Brisbane}" \
-v "$(pwd):/app" \ -v "$(pwd):/app" \
-w '/app/backend' \ -w '/app/backend' \

4
scripts/go-multiarch-wrapper
View File

@@ -26,14 +26,14 @@ echo -e "${BLUE}❯ ${CYAN}Building binaries for ${YELLOW}${GOARCH} (${TARGETPLA
go build \ go build \
-tags 'json1' \ -tags 'json1' \
-buildvcs=false \ -buildvcs=false \
-ldflags "-w -s -X main.commit=${BUILD_COMMIT:-notset} -X main.version=${BUILD_VERSION} -X main.sentryDSN=${SENTRY_DSN:-}" \ -ldflags "-w -s -X main.commit=${BUILD_COMMIT:-notset} -X main.version=${BUILD_VERSION}" \
-o "${1:-/dist/server}" \ -o "${1:-/dist/server}" \
./cmd/server ./cmd/server
# ipranges # ipranges
go build \ go build \
-buildvcs=false \ -buildvcs=false \
-ldflags "-w -s -X main.commit=${BUILD_COMMIT:-notset} -X main.version=${BUILD_VERSION} -X main.sentryDSN=${SENTRY_DSN:-}" \ -ldflags "-w -s -X main.commit=${BUILD_COMMIT:-notset} -X main.version=${BUILD_VERSION}" \
-o "${2:-/dist/ipranges}" \ -o "${2:-/dist/ipranges}" \
./cmd/ipranges ./cmd/ipranges