Release 23.12

CHANGELOG.md

@@ -6,6 +6,16 @@
 
 ***
 
+### Release 23.12
+
+This is a maintenance release.
+
+- Updated Dockerfiles
+  - file `.bashrc` is created earlier (stage `merge_stage_vnc`)
+- Updated file `example-secrets.rc`
+  - removed the initialization of the variables `FORCE_BUILDING` and `FORCE_PUBLISHING_BUILDER_REPO` (unset means `0`)
+  - the variables are still used as before, but now they can be set individually for each building/publishing run
+
 ### Release 23.11
 
 - Added file `$HOME/.bashrc` to all images.

docker/Dockerfile.xfce.20-04

@@ -235,6 +235,9 @@ ENV \
 
 WORKDIR "${HOME}"
 
+### add '.bashrc' and similar resources
+COPY ./src/home "${HOME}"/
+
 
 ##################
 ### stage_chromium
@@ -348,7 +351,6 @@ ENV \
 
 COPY ./src/xfce-startup "${STARTUPDIR}"/
 COPY ./src/tests "${HOME}"/tests/
-COPY ./src/home "${HOME}"/
 
 COPY ./xfce/src/home/config "${HOME}"/.config/
 COPY ./xfce/src/home/Desktop "${HOME}"/Desktop/

docker/Dockerfile.xfce.22-04

@@ -238,6 +238,9 @@ ENV \
 
 WORKDIR "${HOME}"
 
+### add '.bashrc' and similar resources
+COPY ./src/home "${HOME}"/
+
 
 ##################
 ### stage_chromium
@@ -369,7 +372,6 @@ ENV \
 
 COPY ./src/xfce-startup "${STARTUPDIR}"/
 COPY ./src/tests "${HOME}"/tests/
-COPY ./src/home "${HOME}"/
 
 COPY ./xfce/src/home/config "${HOME}"/.config/
 COPY ./xfce/src/home/Desktop "${HOME}"/Desktop/

docker/hooks/post_push

@@ -34,7 +34,7 @@ main() {
         if [[ -n "${GIST_TOKEN}" && -n "${GIST_ID}" && -n "${DEPLOY_GIST_ID}" ]] ; then
 
             if [[ ( -n "${repo_deploy}" && "${repo_deploy}" != "${_prohibited_repo_name}" ) \
-            || ( "${FORCE_PUBLISHING_BUILDER_REPO}" == "1" && -n "${repo_building}" && "${repo_building}" != "${_prohibited_repo_name}" ) ]] ; \
+            || ( "${FORCE_PUBLISHING_BUILDER_REPO:-0}" == "1" && -n "${repo_building}" && "${repo_building}" != "${_prohibited_repo_name}" ) ]] ; \
             then
 
                 ### get values for badges from the image metadata (labels)

docker/hooks/pre_build

@@ -13,7 +13,7 @@ main() {
     local version_sticker
     local -i exit_code=0
 
-    local should_build=${FORCE_BUILDING}
+    local should_build=${FORCE_BUILDING:-0}
     local build_prohibited=${PROHIBIT_BUILDING}
     local cache_script="cache"
 

docker/hooks/push

@@ -73,7 +73,7 @@ main() {
     fi
 
     ### push images into the builder repository
-    if [[ "${FORCE_PUBLISHING_BUILDER_REPO}" == "1" ]] ; then
+    if [[ "${FORCE_PUBLISHING_BUILDER_REPO:-0}" == "1" ]] ; then
 
         if [[ -n "${repo}" && "${repo}" != "${_prohibited_repo_name}" ]] ; then
 

examples/example-secrets.rc

@@ -48,12 +48,12 @@ export DOCKER_BUILDKIT=1
 # export BUILDER_REPO=""
 # ### shared g3-cache is outside the Docker building context
 # export SHARED_G3_CACHE_PATH=""
-# ### building process control
-# # export FORCE_PUBLISHING_BUILDER_REPO=1
-# export FORCE_BUILDING=0
+# ### used to control building/publishing (unset means '0')
+# export FORCE_PUBLISHING_BUILDER_REPO=1
+# export FORCE_BUILDING=1
 # ### used by the 'post_push' hook script, which normally removes the helper files
 # # export KEEP_HELPER_FILES=0
-### explicitly disable features that are enabled by default
+# ### explicitly disable features that are enabled by default
 # # export FEATURES_NOVNC=0
 # # export FEATURES_FIREFOX_PLUS=0
 # # export FEATURES_OVERRIDING_ENVV=0
@@ -82,9 +82,9 @@ export DOCKER_BUILDKIT=1
 # export BUILDER_REPO=""
 # ### shared g3-cache is outside the Docker building context
 # export SHARED_G3_CACHE_PATH=""
-# ### building process control
-# export FORCE_PUBLISHING_BUILDER_REPO=0
-# export FORCE_BUILDING=0
+# ### used to control building/publishing (unset means '0')
+# export FORCE_PUBLISHING_BUILDER_REPO=1
+# export FORCE_BUILDING=1
 # ### used by the 'post_push' hook script, which normally removes the helper files
 # export KEEP_HELPER_FILES=0
 # ### explicitly disable features that are enabled by default