add Bruno, Godot

Author: madebyTimo

.github/workflows/build-release.yaml

@@ -32,7 +32,8 @@ jobs:
                   if (ls /media/saved-cache/*.tar.zst); then
                       docker run --pull always --rm \
                           --volume "/media/saved-cache:/media/saved-cache" \
-                          --volume "docker-development-desktop-build-cache:/media/build-cache" \
+                          --volume \
+                          "docker-development-desktop-build-cache:/media/build-cache" \
                           --workdir /media \
                           madebytimo/scripts \
                           compress.sh --decompress /media/saved-cache/*.tar.zst
@@ -64,8 +65,6 @@ jobs:
                   else
                       builder/build.sh
                   fi
-              env:
-                  MESHCENTRAL_URL: ${{ secrets.MESHCENTRAL_URL }}
             - name: Build update base
               if: ${{ github.event_name == 'schedule'}}
               run: builder/build.sh --publish --update-base
@@ -84,7 +83,8 @@ jobs:
               run: |
                   docker run --pull always --rm \
                       --volume "/media/saved-cache:/media/saved-cache" \
-                      --volume "docker-development-desktop-build-cache:/media/build-cache" \
+                      --volume \
+                      "docker-development-desktop-build-cache:/media/build-cache" \
                       madebytimo/scripts \
                       compress.sh --fast --output /media/saved-cache/build-cache /media/build-cache
                   sudo chown -R "$(whoami)" /media/saved-cache

.github/workflows/static-code-analysis.yaml

@@ -19,7 +19,8 @@ jobs:
                   if (ls /media/saved-cache/*.tar.zst); then
                       docker run --pull always --rm \
                           --volume "/media/saved-cache:/media/saved-cache" \
-                          --volume "docker-development-desktop-build-cache:/media/build-cache" \
+                          --volume \
+                          "docker-development-desktop-build-cache:/media/build-cache" \
                           --workdir /media \
                           madebytimo/scripts \
                           compress.sh --decompress /media/saved-cache/*.tar.zst
@@ -45,7 +46,8 @@ jobs:
               run: |
                   docker run --pull always --rm \
                       --volume "/media/saved-cache:/media/saved-cache" \
-                      --volume "docker-development-desktop-build-cache:/media/build-cache" \
+                      --volume \
+                      "docker-development-desktop-build-cache:/media/build-cache" \
                       madebytimo/scripts \
                       compress.sh --fast --output /media/saved-cache/build-cache /media/build-cache
                   sudo chown -R "$(whoami)" /media/saved-cache

Dockerfile

@@ -5,8 +5,8 @@ ARG MESHCENTRAL_URL
 COPY files/locale.gen /etc/locale.gen
 
 RUN apt update -qq && apt install -y -qq cinnamon dbus dbus-x11 xserver-xorg-video-dummy \
-    && install-autonomous.sh install AndroidStudio Chromium DBeaver DesktopBasics Firefox \
-    IntellijIdea ScriptsDesktop UnityHub VncServer VSCode \
+    && install-autonomous.sh install AndroidStudio Bruno Chromium DBeaver DesktopBasics Firefox \
+    Godot IntellijIdea ScriptsDesktop UnityHub VncServer VSCode \
     && rm -rf /var/lib/apt/lists/* \
     \
     && locale-gen \

Version.txt

@@ -1 +1 @@
-v0.1.1
+v0.2.0

builder/build.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -e
+set -e -o pipefail
 
 SCRIPT_DIR="$(dirname "$(realpath "$0")")"
 

builder/docker.sh

@@ -1,10 +1,11 @@
 #!/usr/bin/env bash
-set -e
+set -e -o pipefail
 
 BUILD_ARGUMENTS=()
-DEPENDENCIES=(docker)
+BUILDER_EXPORT_ARCHIVE="${BUILDER_EXPORT_ARCHIVE:-true}"
+DEPENDENCIES=(docker zstd)
 UPDATE_BASE=false
-PLATFORMS=(amd64)
+PLATFORMS=(linux/amd64)
 REGISTRY_USER="madebytimo"
 APPLICATION_NAME="development-desktop"
 
@@ -14,7 +15,7 @@ for ARGUMENT in "$@"; do
         echo "usage: $(basename "$0") [ARGUMENT]"
         echo "Builds the docker image from the Dockerfile."
         echo "ARGUMENT can be"
-        echo "--platform [amd64|arm64|arm] Build only for specified platform."
+        echo "--platform PLATFORM Build only for specified platform."
         echo "--publish Push the build."
         echo "--update-base Only build if newer base image is available."
         exit
@@ -49,13 +50,15 @@ cd "$PROJECT_DIR"
 mkdir --parents builds
 
 BASE_IMAGE="$(tac Dockerfile | grep --max-count=1 "^FROM" | cut -d" " -f2)"
-docker pull "$BASE_IMAGE"
-BASE_IMAGE_DATE="$(docker image inspect --format="{{ .Created }}" "$BASE_IMAGE" | cut -d "T" -f1)"
+docker pull --quiet "$BASE_IMAGE"
+BASE_IMAGE_DATE="$(docker image inspect --format="{{ .Created }}" "$BASE_IMAGE" \
+    | sed 's|^\([^T ]*\)[T ].*$|\1|')"
 echo "Base image is $BASE_IMAGE from $BASE_IMAGE_DATE"
 IMAGE="${REGISTRY_USER}/${APPLICATION_NAME}"
 if [[ "$UPDATE_BASE" == true ]]; then
     docker pull "$IMAGE"
-    PUSHED_IMAGE_DATE="$(docker image inspect --format="{{ .Created }}" "$IMAGE" | cut -d "T" -f1)"
+    PUSHED_IMAGE_DATE="$(docker image inspect --format="{{ .Created }}" "$IMAGE" \
+        | sed 's|^\([^T ]*\)[T ].*$|\1|')"
     echo "Last pushed image is from $PUSHED_IMAGE_DATE"
     if [[ "$BASE_IMAGE_DATE" < "$PUSHED_IMAGE_DATE" ]]; then
         echo "Used base image is up to date"
@@ -65,10 +68,28 @@ fi
 
 PLATFORMS_STRING="${PLATFORMS[*]}"
 BUILD_ARGUMENTS+=(--platform "${PLATFORMS_STRING// /,}")
-OUTPUT_FILE="builds/${IMAGE//"/"/-}-${VERSION}-oci.tar"
+if [[ "$BUILDER_EXPORT_ARCHIVE" == true ]]; then
+    OUTPUT_FILE="builds/${IMAGE//"/"/-}-${VERSION}-oci.tar"
+    BUILD_ARGUMENTS+=(--output \
+    "type=oci,dest=${OUTPUT_FILE},compression=zstd,compression-level=19,force-compression=true")
+fi
 
-docker buildx build "${BUILD_ARGUMENTS[@]}" --output \
-    "type=oci,dest=${OUTPUT_FILE},compression=zstd,compression-level=19,force-compression=true" \
+docker buildx build "${BUILD_ARGUMENTS[@]}" \
     --tag "${IMAGE}:latest" --tag "${IMAGE}:${VERSION}" \
     --tag "${IMAGE}:${VERSION}-base-${BASE_IMAGE_DATE}" . \
     --build-arg "MESHCENTRAL_URL=$MESHCENTRAL_URL"
+
+if [[ "$BUILDER_EXPORT_ARCHIVE" == true ]]; then
+    docker pull --quiet quay.io/skopeo/stable > /dev/null
+    rm -f builds/.temp-docker-archive.tar
+    for PLATFORM in "${PLATFORMS[@]}"; do
+        docker run --interactive --rm --volume "${PWD}/builds:/builds" \
+            quay.io/skopeo/stable copy --additional-tag "${IMAGE}:latest" --additional-tag \
+            "${IMAGE}:${VERSION}" --additional-tag "${IMAGE}:${VERSION}-base-${BASE_IMAGE_DATE}" \
+            --override-arch "${PLATFORM#*/}" --quiet "oci-archive:${OUTPUT_FILE}:latest" \
+            "docker-archive:builds/.temp-docker-archive.tar"
+        zstd -19 --force --quiet -T0 builds/.temp-docker-archive.tar \
+            -o "${OUTPUT_FILE%oci.tar}${PLATFORM#*/}.tar.zst"
+        rm -f builds/.temp-docker-archive.tar
+    done
+fi