Skip to content

Commit

Permalink
Merge pull request #4 from metal-stack/move-to-docker-make-docker-image
Browse files Browse the repository at this point in the history
Move to alpine-based docker-make docker image.
  • Loading branch information
mwindower authored Aug 6, 2020
2 parents ff64182 + f4a22a4 commit f213709
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 24 deletions.
25 changes: 3 additions & 22 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,27 +1,8 @@
FROM ubuntu:19.10

ARG DOCKER_MAKE_VERSION=alpine
FROM metalstack/docker-make:${DOCKER_MAKE_VERSION}
LABEL repository="https://github.com/metal-stack/action-docker-make"
LABEL maintainer="metal-stack authors <info@metal-stack.io>"

ARG DOCKER_MAKE_VERSION=v0.3.3

RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get --yes install --no-install-recommends \
apt-transport-https \
ca-certificates \
curl \
gnupg2 \
git \
lz4 \
software-properties-common \
&& curl -fsSLo /usr/local/bin/docker-make https://github.com/fi-ts/docker-make/releases/download/${DOCKER_MAKE_VERSION}/docker-make-linux-amd64 \
&& chmod +x /usr/local/bin/docker-make \
&& curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
&& add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu eoan stable" \
&& apt-get update \
&& apt-get --yes install --no-install-recommends docker-ce

COPY LICENSE README.md /
COPY entrypoint.sh /

RUN mv /docker-make /usr/local/bin/docker-make
ENTRYPOINT ["/entrypoint.sh"]
4 changes: 2 additions & 2 deletions entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/bin/sh

echo ""
echo ""
cd "${GITHUB_WORKSPACE}"

export DOCKER_MAKE_REGISTRY_LOGIN_USER="${INPUT_USERNAME}"
export DOCKER_MAKE_REGISTRY_LOGIN_PASSWORD="${INPUT_PASSWORD}"

docker-make --log-level=DEBUG ${INPUT_ARGS}
docker-make ${INPUT_ARGS}

0 comments on commit f213709

Please sign in to comment.