From e9184d12b7986ca3be95122a144d4d454565a195 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Sun, 4 Jul 2021 18:05:12 -0400 Subject: [PATCH 1/9] GibHubBuild of Medley container. --- .github/workflows/build.yml | 70 +++++++++++++++++++++++++++++++++++++ Dockerfile | 25 +++++-------- 2 files changed, 79 insertions(+), 16 deletions(-) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 000000000..04d05662f --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,70 @@ +# based on https://blog.oddbit.com/post/2020-09-25-building-multi-architecture-im/ +--- +name: 'build medley images' + +on: + push: + branches: + - master + +jobs: + docker: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Prepare + id: prep + run: | + #DOCKER_IMAGE=${{ secrets.DOCKER_USERNAME }}/${GITHUB_REPOSITORY#*/} + DOCKER_IMAGE=billstumbo/${GITHUB_REPOSITORY#*/} + VERSION=latest + SHORTREF=${GITHUB_SHA::8} + + # If this is git tag, use the tag name as a docker tag + if [[ $GITHUB_REF == refs/tags/* ]]; then + VERSION=${GITHUB_REF#refs/tags/v} + fi + TAGS="${DOCKER_IMAGE}:${VERSION},${DOCKER_IMAGE}:${SHORTREF}" + + # If the VERSION looks like a version number, assume that + # this is the most recent version of the image and also + # tag it 'latest'. + if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then + TAGS="$TAGS,${DOCKER_IMAGE}:latest" + fi + + # Set output parameters. + echo ::set-output name=tags::${TAGS} + echo ::set-output name=docker_image::${DOCKER_IMAGE} + + - name: Set up QEMU + uses: docker/setup-qemu-action@master + with: + platforms: all + + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@master + + - name: Login to DockerHub + if: github.event_name != 'pull_request' + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Build + uses: docker/build-push-action@v2 + with: + builder: ${{ steps.buildx.outputs.name }} + context: . + file: ./Dockerfile + # Platforms + # linux/amd64 -- Standard x86_64 + # linux/arm64 -- Apple M1 + # linux/arm/v7 -- Raspberry pi + platforms: linux/amd64,linux/arm64,linux/arm/v7 + push: true + tags: ${{ steps.prep.outputs.tags }} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index c14935fe8..6f7b63400 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,24 +1,17 @@ -FROM ubuntu:focal -ENV DEBIAN_FRONTEND=noninteractive +FROM billstumbo/maiko:latest -RUN apt-get update && apt-get install -y build-essential clang libx11-dev -COPY maiko /build/ -WORKDIR /build/bin -RUN rm -rf /build/linux* -RUN ./makeright x +RUN apt-get update && apt-get install -y tightvncserver +EXPOSE 5900 -FROM ubuntu:focal -ENV DEBIAN_FRONTEND=noninteractive +# Need to refine this down to only needed directories. +COPY . /app/medley -EXPOSE 5900 +WORKDIR /app/medley -RUN apt-get update && apt-get install -y tightvncserver -RUN mkdir /app -WORKDIR /app -COPY basics ./ -COPY --from=0 /build/linux.x86_64/* ./ +ENV MEDLEYDIR=/app/medley +ENV MAIKODIR=/app/maiko RUN adduser --disabled-password --gecos "" medley USER medley -ENTRYPOINT USER=medley Xvnc -geometry 1270x720 :0 & DISPLAY=:0 /app/ldex -g 1280x720 full.sysout +ENTRYPOINT USER=medley Xvnc -geometry 1280x720 :0 & DISPLAY=:0 PATH="/app/maiko:$PATH" ./run-medley -full -g 1280x720 -sc 1280x720 \ No newline at end of file From 9ad519e23ac8caa44fd7b1e1b6ddbc6faea2ebe9 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Sun, 4 Jul 2021 18:18:37 -0400 Subject: [PATCH 2/9] Add build.yml to master --- .github/workflows/build.yml | 70 +++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 000000000..b76e2fea3 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,70 @@ +# based on https://blog.oddbit.com/post/2020-09-25-building-multi-architecture-im/ +--- +name: 'build medley images' + +on: + push: + branches: + - master + +jobs: + docker: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Prepare + id: prep + run: | + #DOCKER_IMAGE=${{ secrets.DOCKER_USERNAME }}/${GITHUB_REPOSITORY#*/} + DOCKER_IMAGE=billstumbo/${GITHUB_REPOSITORY#*/} + VERSION=latest + SHORTREF=${GITHUB_SHA::8} + + # If this is git tag, use the tag name as a docker tag + if [[ $GITHUB_REF == refs/tags/* ]]; then + VERSION=${GITHUB_REF#refs/tags/v} + fi + TAGS="${DOCKER_IMAGE}:${VERSION},${DOCKER_IMAGE}:${SHORTREF}" + + # If the VERSION looks like a version number, assume that + # this is the most recent version of the image and also + # tag it 'latest'. + if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then + TAGS="$TAGS,${DOCKER_IMAGE}:latest" + fi + + # Set output parameters. + echo ::set-output name=tags::${TAGS} + echo ::set-output name=docker_image::${DOCKER_IMAGE} + + - name: Set up QEMU + uses: docker/setup-qemu-action@master + with: + platforms: all + + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@master + + - name: Login to DockerHub + if: github.event_name != 'pull_request' + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Build + uses: docker/build-push-action@v2 + with: + builder: ${{ steps.buildx.outputs.name }} + context: . + file: ./Dockerfile + # Platforms + # linux/amd64 -- Standard x86_64 + # linux/arm64 -- Apple M1 + # linux/arm/v7 -- Raspberry pi + platforms: linux/amd64,linux/arm64,linux/arm/v7 + push: true + tags: ${{ steps.prep.outputs.tags }} \ No newline at end of file From 853aca133c8241e11fc2e19fdac7f517d9f78491 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Sun, 4 Jul 2021 18:21:58 -0400 Subject: [PATCH 3/9] fix version --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b76e2fea3..04d05662f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v2 - name: Prepare id: prep From dbe239de240004a746275af5ef0862a9adfc1cbf Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Sun, 4 Jul 2021 18:29:24 -0400 Subject: [PATCH 4/9] add gitHubBuild branch --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 04d05662f..a2151b15f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,6 +6,7 @@ on: push: branches: - master + - gitHubBuild jobs: docker: From 2f41805758f392b40abc43d50b8d92ccf03b9c7f Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Mon, 5 Jul 2021 00:03:24 -0400 Subject: [PATCH 5/9] cleanup --- Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6f7b63400..5a56c9ebf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,9 +9,6 @@ COPY . /app/medley WORKDIR /app/medley -ENV MEDLEYDIR=/app/medley -ENV MAIKODIR=/app/maiko - RUN adduser --disabled-password --gecos "" medley USER medley ENTRYPOINT USER=medley Xvnc -geometry 1280x720 :0 & DISPLAY=:0 PATH="/app/maiko:$PATH" ./run-medley -full -g 1280x720 -sc 1280x720 \ No newline at end of file From cb45f00cea68d2fb0c715643f9163ef942691f61 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Mon, 5 Jul 2021 00:07:03 -0400 Subject: [PATCH 6/9] add in gitHubBuild --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 04d05662f..a2151b15f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,6 +6,7 @@ on: push: branches: - master + - gitHubBuild jobs: docker: From e365bc08e7f6c813fb90e048c0c775b888b738f7 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Sun, 4 Jul 2021 18:05:12 -0400 Subject: [PATCH 7/9] GibHubBuild of Medley container. --- .github/workflows/build.yml | 1 - Dockerfile | 25 +++++++++---------------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a2151b15f..04d05662f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,6 @@ on: push: branches: - master - - gitHubBuild jobs: docker: diff --git a/Dockerfile b/Dockerfile index c14935fe8..6f7b63400 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,24 +1,17 @@ -FROM ubuntu:focal -ENV DEBIAN_FRONTEND=noninteractive +FROM billstumbo/maiko:latest -RUN apt-get update && apt-get install -y build-essential clang libx11-dev -COPY maiko /build/ -WORKDIR /build/bin -RUN rm -rf /build/linux* -RUN ./makeright x +RUN apt-get update && apt-get install -y tightvncserver +EXPOSE 5900 -FROM ubuntu:focal -ENV DEBIAN_FRONTEND=noninteractive +# Need to refine this down to only needed directories. +COPY . /app/medley -EXPOSE 5900 +WORKDIR /app/medley -RUN apt-get update && apt-get install -y tightvncserver -RUN mkdir /app -WORKDIR /app -COPY basics ./ -COPY --from=0 /build/linux.x86_64/* ./ +ENV MEDLEYDIR=/app/medley +ENV MAIKODIR=/app/maiko RUN adduser --disabled-password --gecos "" medley USER medley -ENTRYPOINT USER=medley Xvnc -geometry 1270x720 :0 & DISPLAY=:0 /app/ldex -g 1280x720 full.sysout +ENTRYPOINT USER=medley Xvnc -geometry 1280x720 :0 & DISPLAY=:0 PATH="/app/maiko:$PATH" ./run-medley -full -g 1280x720 -sc 1280x720 \ No newline at end of file From 69d65b11948dfd8a6c782a1464aff1fc8460a259 Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Mon, 5 Jul 2021 00:03:24 -0400 Subject: [PATCH 8/9] cleanup --- Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6f7b63400..5a56c9ebf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,9 +9,6 @@ COPY . /app/medley WORKDIR /app/medley -ENV MEDLEYDIR=/app/medley -ENV MAIKODIR=/app/maiko - RUN adduser --disabled-password --gecos "" medley USER medley ENTRYPOINT USER=medley Xvnc -geometry 1280x720 :0 & DISPLAY=:0 PATH="/app/maiko:$PATH" ./run-medley -full -g 1280x720 -sc 1280x720 \ No newline at end of file From 36c85bdbdec66659865a3df471fc3bf640439f8f Mon Sep 17 00:00:00 2001 From: Bill Stumbo Date: Thu, 29 Jul 2021 00:58:29 -0400 Subject: [PATCH 9/9] Cleanup --- .github/workflows/build.yml | 18 +++++++++++++++--- Dockerfile | 7 ++++++- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 04d05662f..8575d0ffc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,24 +1,29 @@ # based on https://blog.oddbit.com/post/2020-09-25-building-multi-architecture-im/ --- -name: 'build medley images' +# Interlisp workflow to build Docker Image that support multiple architectures +name: 'Build Medley Docker image' +# Run this workflow on push to master on: push: branches: - master +# Jobs that compose this workflow jobs: + # Job to build the docker image docker: runs-on: ubuntu-latest steps: + # Checkout the branch - name: Checkout uses: actions/checkout@v2 + # Setup needed environment variables - name: Prepare id: prep run: | - #DOCKER_IMAGE=${{ secrets.DOCKER_USERNAME }}/${GITHUB_REPOSITORY#*/} - DOCKER_IMAGE=billstumbo/${GITHUB_REPOSITORY#*/} + DOCKER_IMAGE=interlisp/${GITHUB_REPOSITORY#*/} VERSION=latest SHORTREF=${GITHUB_SHA::8} @@ -38,16 +43,20 @@ jobs: # Set output parameters. echo ::set-output name=tags::${TAGS} echo ::set-output name=docker_image::${DOCKER_IMAGE} + echo ::set-output name=build_time::$(date -u +'%Y-%m-%dT%H:%M:%SZ') + # Setup Docker Machine Emulation environment - name: Set up QEMU uses: docker/setup-qemu-action@master with: platforms: all + # Setup Docker Buildx function - name: Set up Docker Buildx id: buildx uses: docker/setup-buildx-action@master + # Login to DockerHub - required to store the image - name: Login to DockerHub if: github.event_name != 'pull_request' uses: docker/login-action@v1 @@ -55,6 +64,7 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} + # Start the Docker Build using the Dockerfilein the repository - name: Build uses: docker/build-push-action@v2 with: @@ -66,5 +76,7 @@ jobs: # linux/arm64 -- Apple M1 # linux/arm/v7 -- Raspberry pi platforms: linux/amd64,linux/arm64,linux/arm/v7 + # Push the created image push: true + # tags to assign to the Docker image tags: ${{ steps.prep.outputs.tags }} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 5a56c9ebf..92e97ed74 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,9 @@ -FROM billstumbo/maiko:latest +FROM interlisp/maiko:latest +ARG BUILD_DATE +LABEL name="Medley" +LABEL description="The Medley Interlisp environment" +LABEL url="https://github.com/Interlisp/medley" +LABEL build-time=$BUILD_DATE RUN apt-get update && apt-get install -y tightvncserver