From fe1fb1935c71046641da69bf6e1d68f9079393a6 Mon Sep 17 00:00:00 2001 From: Konstantin Demin Date: Sun, 21 Jul 2024 01:14:36 +0300 Subject: [PATCH] minor fixes --- .ci/envsh.common | 2 +- Dockerfile.ci | 4 ++-- return-code.go | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.ci/envsh.common b/.ci/envsh.common index b66907c..626e6ed 100644 --- a/.ci/envsh.common +++ b/.ci/envsh.common @@ -50,7 +50,7 @@ CI_COMMIT_REF_SLUG="$(image_tag_norm "${CI_COMMIT_REF_SLUG}")" ## image tag(s) IMAGE_TAG="${CI_COMMIT_SHORT_SHA}-b${CI_PIPELINE_NUMBER}-${CI_COMMIT_REF_SLUG}" -EXTRA_TAGS=$(image_tag_norm "branch-${CI_COMMIT_BRANCH}") +EXTRA_TAGS= if [ -n "${CI_COMMIT_TAG}" ] ; then IMAGE_TAG="${CI_COMMIT_SHORT_SHA}" EXTRA_TAGS="${CI_COMMIT_REF_SLUG}" diff --git a/Dockerfile.ci b/Dockerfile.ci index f75cf58..984f243 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -6,7 +6,7 @@ FROM --platform=${TARGET_PLATFORM} ${BASE_IMAGE} ARG PLATFORM_SUFFIX COPY /dist/rngpotd${PLATFORM_SUFFIX} /bin/rngpotd -ENTRYPOINT [ ] -CMD [ "/bin/rngpotd" ] +ENTRYPOINT [ "/bin/rngpotd" ] +CMD [ ] USER nonroot:nonroot diff --git a/return-code.go b/return-code.go index d3c0d80..8182d07 100644 --- a/return-code.go +++ b/return-code.go @@ -8,8 +8,6 @@ var ( rngRetCodes = [...]int{ fiber.StatusTeapot, - fiber.StatusEarlyHints, - fiber.StatusNonAuthoritativeInformation, fiber.StatusNoContent, fiber.StatusResetContent,