From 88fb036f1c569f629b491278f358d8d7eb2047b6 Mon Sep 17 00:00:00 2001 From: Simon Marsh Date: Sun, 24 Sep 2023 13:11:56 +0100 Subject: [PATCH] build directly to docker image --- .drone.yml | 71 +++++++++--------------------------------------------- Dockerfile | 27 +++++++++++++++++++++ 2 files changed, 39 insertions(+), 59 deletions(-) create mode 100644 Dockerfile diff --git a/.drone.yml b/.drone.yml index af239d2..b76cf95 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,67 +12,20 @@ steps: - go vet - go build - - name: static build - image: alpine - commands: - - tar cvzf staticroot.tar.gz -C StaticRoot . - - - name: upload bin - image: plugins/s3 + - name: docker + image: plugins/docker settings: - bucket: artifacts - access_key: - from_secret: MINIO_ACCESS_KEY - secret_key: - from_secret: MINIO_SECRET_KEY - endpoint: https://minio.burble.dn42 - region: fr-par1 - path_style: true - source: dn42regsrv - target: /dn42regsrv/${DRONE_BRANCH} - - - name: upload site - image: plugins/s3 - settings: - bucket: artifacts - access_key: - from_secret: MINIO_ACCESS_KEY - secret_key: - from_secret: MINIO_SECRET_KEY - endpoint: https://minio.burble.dn42 - region: fr-par1 - path_style: true - source: staticroot.tar.gz - target: /dn42regsrv/${DRONE_BRANCH} - + registry: git.burble.dn42 + repo: git.burble.dn42/burble.dn42/dn42regsrv + tags: latest + username: burble + password: + from_secret: TOKEN + --- kind: secret -name: MINIO_ACCESS_KEY +name: TOKEN get: - path: burble.dn42/kv/data/drone/minio - name: ACCESS_KEY + path: burble.dn42/kv/data/drone/git.burble.dn42 + name: artifact-token ---- -kind: secret -name: MINIO_SECRET_KEY -get: - path: burble.dn42/kv/data/drone/minio - name: SECRET_KEY - - -steps: - - name: build - environment: - CGO_ENABLED: 0 - commands: - - go build - - - name: stage - commands: - - stage_artifact.sh dn42regsrv dn42regsrv StaticRoot - - - name: promote - commands: - - promote_artifact.sh dn42regsrv - when: - branch: master diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..3b44aac --- /dev/null +++ b/Dockerfile @@ -0,0 +1,27 @@ +########################################################################### + +FROM alpine +MAINTAINER burble +VOLUME /registry + +########################################################################### + +RUN apk add --update git && rm -rf /var/cache/apk/* + +ADD dn42regsrv /usr/local/bin/dn42regsrv +ADD StaticRoot /StaticRoot +RUN mkdir -p /registry && \ + chown -R 1000:1000 /registry /usr/local/bin/dn42regsrv /StaticRoot && \ + chmod u+rx /usr/local/bin/dn42regsrv && \ + chmod -R u+rX /StaticRoot /registry + +########################################################################### + +USER 1000 +WORKDIR /registry +EXPOSE 8042 + +ENTRYPOINT [ "/usr/local/bin/dn42regsrv", "-d", "/registry", "-s", "/StaticRoot" ] + +########################################################################### +# end of file \ No newline at end of file