diff --git a/.github/workflows/buildDocker.yml b/.github/workflows/buildDocker.yml index 58c4d3e0..93d63914 100644 --- a/.github/workflows/buildDocker.yml +++ b/.github/workflows/buildDocker.yml @@ -50,6 +50,8 @@ jobs: echo ::set-output name=docker_image::${DOCKER_IMAGE} echo ::set-output name=build_time::$(date -u +'%Y-%m-%dT%H:%M:%SZ') echo ::set-output name=version::${VERSION} + echo ::set-output name=maiko_release::${MAIKO_RELEASE} + echo ::set-output name=medley_release::${MEDLEY_RELEASE} # Download Medley Release Assets - name: Download Release Assets @@ -103,4 +105,8 @@ jobs: # Push the created image push: true # tags to assign to the Docker image - tags: ${{ steps.prep.outputs.tags }} \ No newline at end of file + tags: ${{ steps.prep.outputs.tags }} + build-args: | + medley_release=${{steps.prep.outputs.medley_release}} + maiko_release=${{steps.prep.outputs.maiko_release}} + build_date=${{steps.prep.outputs.build_time}} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 979ce161..1f3cb137 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,24 @@ FROM ubuntu:focal -ARG BUILD_DATE +ARG build_date +ARG medley_release +ARG maiko_release LABEL name="Medley" # LABEL tags=${tags} LABEL description="The Medley Interlisp environment" LABEL url="https://github.com/Interlisp/medley" -LABEL build-time=$BUILD_DATE +LABEL build-time=$build_date +ENV BUILD_DATE=$build_date +ENV MEDLEY_RELEASE=$medley_release +ENV MAIKO_RELEASE=$maiko_release RUN apt-get update && apt-get install -y tightvncserver EXPOSE 5900 # Copy and uncompress loadup and required source files. -ADD *.tgz /app +ADD *.tgz /home -WORKDIR /app/medley +WORKDIR /home/medley RUN adduser --disabled-password --gecos "" medley USER medley