diff --git a/.circleci/config.yml b/.circleci/config.yml index bd95f2c8a..4f84e2dc7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -56,33 +56,47 @@ jobs: name: Build containers command: | docker build -t mozilla/sops . + docker build -f Dockerfile.alpine -t mozilla/sops:alpine . - run: name: Tag & Push containers command: | #latest bin/ci/deploy_dockerhub.sh "latest" + bin/ci/deploy_dockerhub.sh "alpine" # by sha echo "Tag and push mozilla/sops:$CIRCLE_SHA1" docker tag mozilla/sops "mozilla/sops:$CIRCLE_SHA1" bin/ci/deploy_dockerhub.sh "$CIRCLE_SHA1" + # no sha for alpine + # by semver # v1.2.3 if [ ! -z $PATCH ];then echo "Tag and Push mozilla/sops:v$MAJOR.$MINOR.$PATCH" docker tag mozilla/sops "mozilla/sops:v$MAJOR.$MINOR.$PATCH" bin/ci/deploy_dockerhub.sh "v$MAJOR.$MINOR.$PATCH" + + echo "Tag and Push mozilla/sops:v$MAJOR.$MINOR.$PATCH-alpine" + docker tag mozilla/sops:alpine "mozilla/sops:v$MAJOR.$MINOR.$PATCH-alpine" + bin/ci/deploy_dockerhub.sh "v$MAJOR.$MINOR.$PATCH-alpine" fi # v1.2 if [ ! -z $MINOR ];then echo "Tag and Push mozilla/sops:v$MAJOR.$MINOR" docker tag mozilla/sops "mozilla/sops:v$MAJOR.$MINOR" bin/ci/deploy_dockerhub.sh "v$MAJOR.$MINOR" + + echo "Tag and Push mozilla/sops:v$MAJOR.$MINOR-alpine" + docker tag mozilla/sops:alpine "mozilla/sops:v$MAJOR.$MINOR-alpine" + bin/ci/deploy_dockerhub.sh "v$MAJOR.$MINOR-alpine" fi # v1 echo "Tag and Push mozilla/sops:v$MAJOR" docker tag mozilla/sops "mozilla/sops:v$MAJOR" bin/ci/deploy_dockerhub.sh "v$MAJOR" - + echo "Tag and Push mozilla/sops:v$MAJOR-alpine" + docker tag mozilla/sops:alpine "mozilla/sops:v$MAJOR-alpine" + bin/ci/deploy_dockerhub.sh "v$MAJOR-alpine" diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000000000..a7d3e834d --- /dev/null +++ b/.dockerignore @@ -0,0 +1,3 @@ +/.git +/Dockerfile +/Dockerfile.alpine diff --git a/Dockerfile.alpine b/Dockerfile.alpine new file mode 100644 index 000000000..2be5d6b5c --- /dev/null +++ b/Dockerfile.alpine @@ -0,0 +1,17 @@ +FROM golang:1.12-alpine3.10 AS builder + +RUN apk --no-cache add make + +COPY . /go/src/go.mozilla.org/sops +WORKDIR /go/src/go.mozilla.org/sops + +RUN CGO_ENABLED=1 make install + + +FROM alpine:3.10 + +RUN apk --no-cache add \ + vim ca-certificates +ENV EDITOR vim +COPY --from=builder /go/bin/sops /usr/local/bin/sops +ENTRYPOINT ["/usr/local/bin/sops"]