From 5db4aff9530456842e43ea22090e91be1d671ac0 Mon Sep 17 00:00:00 2001 From: dave-juicelabs <70105130+dave-juicelabs@users.noreply.github.com> Date: Sat, 22 Jul 2023 10:01:05 -0500 Subject: [PATCH] Small fixes to the github controller docker image flow (#27) * Updating the github workflow to automatically create docker images for each master commit Signed-off-by: David McCloskey <dave@juicelabs.co> * Small fixes to the github controller docker image flow Signed-off-by: David McCloskey <dave@juicelabs.co> --------- Signed-off-by: David McCloskey <dave@juicelabs.co> --- .github/workflows/controller-docker-image.yml | 3 +++ docker/controller/Dockerfile | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/controller-docker-image.yml b/.github/workflows/controller-docker-image.yml index 3c9854e..9e905d0 100644 --- a/.github/workflows/controller-docker-image.yml +++ b/.github/workflows/controller-docker-image.yml @@ -31,6 +31,9 @@ jobs: - name: Controller Image uses: docker/build-push-action@v3 with: + build-args: | + BASE_CONTAINER=ubuntu:22.04 + JUICE_VERSION=${{ steps.version.outputs.version }} context: docker/controller push: true tags: juicelabs/controller:${{ steps.version.outputs.version }} diff --git a/docker/controller/Dockerfile b/docker/controller/Dockerfile index 1346adf..d344904 100644 --- a/docker/controller/Dockerfile +++ b/docker/controller/Dockerfile @@ -9,6 +9,11 @@ RUN cd /tmp/juice && \ FROM ${BASE_CONTAINER} +ARG JUICE_VERSION +ENV JUICE_VERSION=${JUICE_VERSION} +LABEL "juicelabs.co/version"=${JUICE_VERSION} +LABEL maintainer="JUICE TECHNOLOGIES <juicelabs.co>" + ARG PORT=8080 ENV PORT=${PORT} EXPOSE ${PORT} @@ -18,5 +23,3 @@ WORKDIR /root COPY --from=build /tmp/juice/controller . ENTRYPOINT ["/bin/bash", "-c", "./controller --address 0.0.0.0:${PORT}", "--"] - -LABEL maintainer="JUICE TECHNOLOGIES <juicelabs.co>" -- GitLab