From 1c7b76d0e7b3e31733b3ce1eb77fa9fada56a904 Mon Sep 17 00:00:00 2001 From: Piyoosh Mukhija Date: Thu, 11 Jan 2024 14:07:37 -0500 Subject: [PATCH 1/2] Add execution permissions to script Adds execution permissions to the scripts in the repository. The source repsitory for this fork did not set any permissions. --- builder.sh | 0 ci-builder.sh | 0 docker/hooks/build | 0 docker/hooks/cache | 0 docker/hooks/env.rc | 0 docker/hooks/post_push | 0 docker/hooks/pre_build | 0 docker/hooks/push | 0 docker/hooks/release_of | 0 docker/hooks/util.rc | 0 docker/src/tests/test-01.sh | 0 docker/src/xfce-startup/set_user_permissions.sh | 0 docker/src/xfce-startup/startup.sh | 0 docker/src/xfce-startup/version_of.sh | 0 docker/src/xfce-startup/version_sticker.sh | 0 .../src/firefox.plus/resources/copy_firefox_user_preferences.sh | 0 utils/util-readme.sh | 0 17 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 builder.sh mode change 100644 => 100755 ci-builder.sh mode change 100644 => 100755 docker/hooks/build mode change 100644 => 100755 docker/hooks/cache mode change 100644 => 100755 docker/hooks/env.rc mode change 100644 => 100755 docker/hooks/post_push mode change 100644 => 100755 docker/hooks/pre_build mode change 100644 => 100755 docker/hooks/push mode change 100644 => 100755 docker/hooks/release_of mode change 100644 => 100755 docker/hooks/util.rc mode change 100644 => 100755 docker/src/tests/test-01.sh mode change 100644 => 100755 docker/src/xfce-startup/set_user_permissions.sh mode change 100644 => 100755 docker/src/xfce-startup/startup.sh mode change 100644 => 100755 docker/src/xfce-startup/version_of.sh mode change 100644 => 100755 docker/src/xfce-startup/version_sticker.sh mode change 100644 => 100755 docker/xfce-firefox/src/firefox.plus/resources/copy_firefox_user_preferences.sh mode change 100644 => 100755 utils/util-readme.sh diff --git a/builder.sh b/builder.sh old mode 100644 new mode 100755 diff --git a/ci-builder.sh b/ci-builder.sh old mode 100644 new mode 100755 diff --git a/docker/hooks/build b/docker/hooks/build old mode 100644 new mode 100755 diff --git a/docker/hooks/cache b/docker/hooks/cache old mode 100644 new mode 100755 diff --git a/docker/hooks/env.rc b/docker/hooks/env.rc old mode 100644 new mode 100755 diff --git a/docker/hooks/post_push b/docker/hooks/post_push old mode 100644 new mode 100755 diff --git a/docker/hooks/pre_build b/docker/hooks/pre_build old mode 100644 new mode 100755 diff --git a/docker/hooks/push b/docker/hooks/push old mode 100644 new mode 100755 diff --git a/docker/hooks/release_of b/docker/hooks/release_of old mode 100644 new mode 100755 diff --git a/docker/hooks/util.rc b/docker/hooks/util.rc old mode 100644 new mode 100755 diff --git a/docker/src/tests/test-01.sh b/docker/src/tests/test-01.sh old mode 100644 new mode 100755 diff --git a/docker/src/xfce-startup/set_user_permissions.sh b/docker/src/xfce-startup/set_user_permissions.sh old mode 100644 new mode 100755 diff --git a/docker/src/xfce-startup/startup.sh b/docker/src/xfce-startup/startup.sh old mode 100644 new mode 100755 diff --git a/docker/src/xfce-startup/version_of.sh b/docker/src/xfce-startup/version_of.sh old mode 100644 new mode 100755 diff --git a/docker/src/xfce-startup/version_sticker.sh b/docker/src/xfce-startup/version_sticker.sh old mode 100644 new mode 100755 diff --git a/docker/xfce-firefox/src/firefox.plus/resources/copy_firefox_user_preferences.sh b/docker/xfce-firefox/src/firefox.plus/resources/copy_firefox_user_preferences.sh old mode 100644 new mode 100755 diff --git a/utils/util-readme.sh b/utils/util-readme.sh old mode 100644 new mode 100755 From e51be6d87e455d7b333cd5e68fa945fd81ce33fe Mon Sep 17 00:00:00 2001 From: Piyoosh Mukhija Date: Thu, 11 Jan 2024 14:20:14 -0500 Subject: [PATCH 2/2] Allow custom BASETAG values --- docker/hooks/env.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/hooks/env.rc b/docker/hooks/env.rc index 03f47c4..6dcdff0 100755 --- a/docker/hooks/env.rc +++ b/docker/hooks/env.rc @@ -128,13 +128,13 @@ case "${_branch}" in latest | latest-chromium | latest-firefox | jammy | jammy-chromium | jammy-firefox ) - BASETAG="22.04" + BASETAG="${BASETAG:-22.04}" DOCKERFILE_PATH="${_build_context}/Dockerfile.xfce.22-04" ;; focal | focal-chromium | focal-firefox ) - BASETAG="20.04" + BASETAG="${BASETAG:-20.04}" DOCKERFILE_PATH="${_build_context}/Dockerfile.xfce.20-04" ;;