Merge branch 'master' of https://gitea.akanealw.com/akanealw/debian-vnc-xfce-g3

scripts to build
testing
2024-04-01 22:37:53 +00:00 · 2024-04-01 22:37:31 +00:00 · 2024-03-29 03:26:57 -05:00 · 2024-01-30 07:16:49 -06:00 · 2024-01-30 07:05:32 -06:00 · 2024-01-30 06:59:58 -06:00
71 changed files with 235 additions and 27 deletions
--- a/.gitattributes
+++ b/.gitattributes
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,6 @@
 avanti*
 debug*
 scrap*
-secret*
+#secret*
 TODO*
 *.log
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,27 @@

 ***

+### 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.
+It contains examples of custom aliases
+  - `ll` - just `ls -l`
+  - `cls` - clears the terminal window
+  - `ps1` - sets the command prompt text
+
+- Added more 'die-fast' error handling into the building and publishing scripts.
+They exit immediately if the image building or pushing commands fail.
+
 ### Release 23.08.1 (Milestone)

 This release brings new images based on the current **Debian 12**.
@@ -15,6 +36,7 @@ Other changes:

 - hook scripts `env.rc`, `push` and `post_push` have been updated
 - handling of multiple deployment tags per image has been improved and it covers also publishing into the builder repository now
+  - also less image pollution by publishing
 - file `readme-local-building-example.md` got a new section `Tips and examples`, containing
  - `How to deploy all images into one repository`

--- a/0
+++ b/0
--- a/README.md
+++ b/README.md
--- a/build-base-and-push-to-gitea.sh
+++ b/build-base-and-push-to-gitea.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+./builder.sh latest pre_build
+./builder.sh latest build
+docker push repo.aknlw.com/akanealw/debian-vnc-xfce:latest
--- a/build-chromium-and-push-to-gitea.sh
+++ b/build-chromium-and-push-to-gitea.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+./builder.sh latest-chromium pre_build
+./builder.sh latest-chromium build
+docker push repo.aknlw.com/akanealw/debian-vnc-xfce:latest-chromium
--- a/build-firefox-and-push-to-gitea.sh
+++ b/build-firefox-and-push-to-gitea.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+./builder.sh latest-firefox pre_build
+./builder.sh latest-firefox build
+docker push repo.aknlw.com/akanealw/debian-vnc-xfce:latest-firefox-default
--- a/builder.sh
+++ b/builder.sh
@@ -12,7 +12,7 @@ die() {
    local -i code=${2:-1}
    local place="${3:-$0}"

-    echo -e "EXITING '${place}' with code ${code}: ${message}" >&2
+    echo -e "EXITING at line "${BASH_LINENO[0]}" in '${place}' with code ${code}: ${message}" >&2
    exit ${code}
 }

--- a/ci-builder.sh
+++ b/ci-builder.sh
@@ -13,7 +13,7 @@ die() {
    local -i code=${2:-1}
    local place="${3:-$0}"

-    echo -e "\nEXITING '${place}' with code ${code}: ${message}\n" >&2
+    echo -e "\nEXITING at line "${BASH_LINENO[0]}" in '${place}' with code ${code}: ${message}\n" >&2
    exit ${code}
 }

@@ -289,7 +289,7 @@ main() {
                        pivotal )

                            clear_log
-                            build_group "${command}" "latest" "latest-firefox" "latest-chromium"
+                            build_group "${command}" "latest" "bullseye" "latest-firefox" "bullseye-firefox" "latest-chromium" "bullseye-chromium"
                            ;;

                        complete )
--- a/docker/.dockerignore
+++ b/docker/.dockerignore
@@ -2,3 +2,4 @@
 !src
 !xfce*
 !.g3-cache
+
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
--- a/docker/Dockerfile.xfce.11
+++ b/docker/Dockerfile.xfce.11
@@ -8,9 +8,9 @@ ARG ARG_MERGE_STAGE_BROWSER_BASE=merge_stage_vnc
 ARG ARG_FINAL_STAGE_BASE=merge_stage_browser

 ARG ARG_HEADLESS_USER_ID=1000
-ARG ARG_HEADLESS_USER_NAME=headless
+ARG ARG_HEADLESS_USER_NAME=akanealw
 ARG ARG_HEADLESS_USER_GROUP_ID=1000
-ARG ARG_HEADLESS_USER_GROUP_NAME=headless
+ARG ARG_HEADLESS_USER_GROUP_NAME=akanealw
 ARG ARG_SUDO_INITIAL_PW=headless


@@ -91,7 +91,9 @@ RUN \
    --mount=type=cache,from=stage_cache,sharing=locked,source=/var/lib/apt,target=/var/lib/apt \
    DEBIAN_FRONTEND=noninteractive apt-get install -y "${ARG_APT_NO_RECOMMENDS:+--no-install-recommends}" \
        xfce4 \
-        xfce4-terminal
+        xfce4-terminal \
+        gnome-themes-extra \
+        gnome-themes-extra-data 


 ###############
@@ -209,7 +211,6 @@ RUN echo \
        <meta charset=\"utf-8\"/>\n\
    </head>\n\
    <body>\n\
-        <p><a href=\"vnc_lite.html\">noVNC Lite Client</a></p>\n\
        <p><a href=\"vnc.html\">noVNC Full Client</a></p>\n\
    </body>\n\
 </html>" \
@@ -237,6 +238,9 @@ ENV \

 WORKDIR "${HOME}"

+### add '.bashrc' and similar resources
+COPY ./src/home "${HOME}"/
+

 ##################
 ### stage_chromium
--- a/docker/Dockerfile.xfce.12
+++ b/docker/Dockerfile.xfce.12
@@ -8,9 +8,9 @@ ARG ARG_MERGE_STAGE_BROWSER_BASE=merge_stage_vnc
 ARG ARG_FINAL_STAGE_BASE=merge_stage_browser

 ARG ARG_HEADLESS_USER_ID=1000
-ARG ARG_HEADLESS_USER_NAME=headless
+ARG ARG_HEADLESS_USER_NAME=akanealw
 ARG ARG_HEADLESS_USER_GROUP_ID=1000
-ARG ARG_HEADLESS_USER_GROUP_NAME=headless
+ARG ARG_HEADLESS_USER_GROUP_NAME=akanealw
 ARG ARG_SUDO_INITIAL_PW=headless


@@ -91,7 +91,9 @@ RUN \
    --mount=type=cache,from=stage_cache,sharing=locked,source=/var/lib/apt,target=/var/lib/apt \
    DEBIAN_FRONTEND=noninteractive apt-get install -y "${ARG_APT_NO_RECOMMENDS:+--no-install-recommends}" \
        xfce4 \
-        xfce4-terminal
+        xfce4-terminal \
+        gnome-themes-extra \
+        gnome-themes-extra-data 


 ###############
@@ -209,7 +211,6 @@ RUN echo \
        <meta charset=\"utf-8\"/>\n\
    </head>\n\
    <body>\n\
-        <p><a href=\"vnc_lite.html\">noVNC Lite Client</a></p>\n\
        <p><a href=\"vnc.html\">noVNC Full Client</a></p>\n\
    </body>\n\
 </html>" \
@@ -237,6 +238,9 @@ ENV \

 WORKDIR "${HOME}"

+### add '.bashrc' and similar resources
+COPY ./src/home "${HOME}"/
+

 ##################
 ### stage_chromium
--- a/docker/README.md
+++ b/docker/README.md
--- a/docker/doc/images/animation-debian-vnc-xfce-chromium-g3.gif
+++ b/docker/doc/images/animation-debian-vnc-xfce-chromium-g3.gif
--- a/docker/doc/images/animation-debian-vnc-xfce-firefox-g3.gif
+++ b/docker/doc/images/animation-debian-vnc-xfce-firefox-g3.gif
--- a/docker/doc/images/animation-debian-vnc-xfce-g3.gif
+++ b/docker/doc/images/animation-debian-vnc-xfce-g3.gif
--- a/docker/hooks/build
+++ b/docker/hooks/build
@@ -62,8 +62,8 @@ main() {
    now="$(date --utc +%FT%TZ)"
    echo "Current timestamp: ${now}" ; echo

+    ### no quotes around ${params}!
    set -x
-    ### no quotes around 'params'
    docker build ${params} \
        -f "${DOCKERFILE_PATH}" \
            --build-arg BASEIMAGE="${BASEIMAGE}" \
@@ -91,7 +91,11 @@ main() {
            ${FEATURES_FIREFOX_PLUS:+--build-arg ARG_MERGE_STAGE_BROWSER_BASE="stage_firefox_plus"} \
            \
        -t "${DOCKER_REPO}:${DOCKER_TAG}${target_stage:+_${target_stage}}" "${_build_context}"
+
+    exit_code=$?
    set +x
+    
+    if [[ ${exit_code} -ne 0 ]] ; then die "Failed to build image '${DOCKER_REPO}:${DOCKER_TAG}'" ${exit_code} ; fi
 }

 main $@
--- a/docker/hooks/cache
+++ b/docker/hooks/cache
--- a/docker/hooks/env.rc
+++ b/docker/hooks/env.rc
@@ -5,7 +5,7 @@ die() {
    local -i code=${2:-1}
    local place="${3:-$0}"

-    echo -e "EXITING '${place}' with code ${code}: ${message}" >&2
+    echo -e "EXITING at line "${BASH_LINENO[0]}" in '${place}' with code ${code}: ${message}" >&2
    exit ${code}
 }

@@ -78,7 +78,7 @@ if [[ $# -ge 2 ]] ; then shift 2 ; fi
 ### Remark: There are also 'FEATURES_*' variables that are always set, e.g. 'FEATURES_VERSION_STICKER=1'.

 ### These features influence the content of almost all stages:
-### Warning! Anything except '0' means '1', even unset or emty.
+### Warning! Anything except '0' means '1', even unset or empty.
 if [[ "${FEATURES_BUILD_SLIM}" == "0" ]] ; then FEATURES_BUILD_SLIM="" ; else FEATURES_BUILD_SLIM=1 ; fi

 ### These features influence the content of the related stages:
@@ -90,7 +90,7 @@ if [[ "${FEATURES_CHROMIUM}" == "1" ]] ; then FEATURES_CHROMIUM=1 ; else FEATURE
 if [[ "${FEATURES_FIREFOX}" == "1" ]] ; then FEATURES_FIREFOX=1 ; else FEATURES_FIREFOX="" ; fi

 ### These features influence container behaviour at startup time
-### Warning! Anything except '0' means '1', even unset or emty.
+### Warning! Anything except '0' means '1', even unset or empty.
 if [[ "${FEATURES_OVERRIDING_ENVV}" == "0" ]] ; then FEATURES_OVERRIDING_ENVV="" ; else FEATURES_OVERRIDING_ENVV=1 ; fi

 ### These features are always enabled and cannot be disabled via environment variables
--- a/docker/hooks/post_push
+++ b/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)
--- a/docker/hooks/pre_build
+++ b/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"

@@ -57,8 +57,9 @@ main() {
    fi

    ### build a temporary helper image for getting the current version sticker values
+
+    ### no quotes around ${params}!
    set -x
-    ### no quotes around 'params'
    docker build ${params} \
        -f "${DOCKERFILE_PATH}" \
            --build-arg BASEIMAGE="${BASEIMAGE}" \
@@ -82,8 +83,12 @@ main() {
            ${FEATURES_FIREFOX_PLUS:+--build-arg ARG_MERGE_STAGE_BROWSER_BASE="stage_firefox_plus"} \
            \
        -t "${DOCKER_REPO}":"${DOCKER_TAG}${helper_suffix}" "${_build_context}"
+    
+    exit_code=$?
    set +x

+    if [[ ${exit_code} -ne 0 ]] ; then set +x; die "Failed to build image '${DOCKER_REPO}:${DOCKER_TAG}${helper_suffix}'" ${exit_code} ; fi
+
    ### get the actual verbose version sticker value from the helper image and store it as the current one
    ### note that some apps require display to report their versions correctly (e.g. Ristretto or Screenshooter)
    # version_sticker="$( docker run --rm ${DOCKER_REPO}:${DOCKER_TAG}${helper_suffix} --skip-vnc --version-sticker-verbose )"
--- a/docker/hooks/push
+++ b/docker/hooks/push
@@ -12,6 +12,7 @@ deployment_push() {
    local target
    local repo="${_deploy_repo##*/}"
    local keeper_repo_tag="${_deploy_builder_tags[0]}"
+    local -i exit_code=0

    if [[ -n "${repo}" && "${repo}" != "${_prohibited_repo_name}" ]] ; then

@@ -27,7 +28,13 @@ deployment_push() {
                echo ; echo "Deploying image '${target}'"
                docker tag "${DOCKER_REPO}:${keeper_repo_tag}" "${target}"
                docker push "${target}"
+                exit_code=$?
                docker rmi "${target}"
+
+                if [[ ${exit_code} -ne 0 ]] ; then
+                    docker logout
+                    die "Unable to push image '${target}'" ${exit_code}
+                fi
            fi
        done

@@ -40,6 +47,7 @@ main() {
    local target
    local repo="${DOCKER_REPO##*/}"
    local keeper_repo_tag="${_deploy_builder_tags[0]}"
+    local -i exit_code=0

    if [[ -f "${_build_context}/${_scrap_demand_stop_building}" ]] ; then
        echo "Skipping push on demand."
@@ -65,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

@@ -78,13 +86,24 @@ main() {

                    # first element is the master repo (a keeper)
                    docker push "${DOCKER_REPO}:${t}"
+                    exit_code=$?

+                    if [[ ${exit_code} -ne 0 ]] ; then
+                        docker logout
+                        die "Unable to push image '${DOCKER_REPO}:${t}'" ${exit_code}
+                    fi
                else
                    target="${DOCKER_REPO}:${t}"

                    docker tag "${DOCKER_REPO}:${keeper_repo_tag}" "${target}"
                    docker push "${target}"
+                    exit_code=$?
                    docker rmi "${target}"
+
+                    if [[ ${exit_code} -ne 0 ]] ; then
+                        docker logout
+                        die "Unable to push image '${target}'" ${exit_code}
+                    fi
                fi
            done

--- a/docker/hooks/release_of
+++ b/docker/hooks/release_of
--- a/docker/hooks/secrets.rc
+++ b/docker/hooks/secrets.rc
@@ -0,0 +1,116 @@
+### This files configures the environment (including secrets!) for building images locally.
+### Source this file before building.
+### Rename it to "secrets.rc" (or similar) and **make sure** that the '.gitignore' and '.dockerignore' files 
+### contain the 'secret*' exclusion pattern!
+### Example: source ./secrets.rc
+### This file is automatically sourced by the script 'hooks/env.rc' if it's found in the same directory.
+
+#region General building pipeline control
+
+export DOCKER_BUILDKIT=1
+# export COMPOSE_DOCKER_CLI_BUILD=0
+
+### will force re-building regardless of the verbose version sticker changes
+export FORCE_BUILDING=1
+
+### will prohibit re-building regardless of verbose version sticker changes
+# export PROHIBIT_BUILDING=0
+
+#endregion
+
+
+#region Optional version sticker prefix and/or suffix
+
+# export VERSION_STICKER_PREFIX="LOCAL-BETA-"
+# export VERSION_STICKER_SUFFIX="-BETA"
+
+#endregion
+
+
+#region Development environment
+
+### -----------------------
+### development environment
+### -----------------------
+
+# ### owner of Gitea repos
+# export REPO_OWNER_NAME=""
+# ### development builder gist
+# export GIST_ID=""
+# ### development deployment gist
+# export DEPLOY_GIST_ID=""
+# ### note that the reserved repository name 'void' will prohibit the publishing
+# ### primary deployment repos may not exist (may be also left unset)
+# export DEPLOYMENT_REPO=""
+# export DEPLOYMENT_REPO_CHROMIUM=""
+# export DEPLOYMENT_REPO_FIREFOX=""
+# ### builder repo can be a secondary deployment repo (if FORCE_PUBLISHING_BUILDER_REPO=1)
+# export BUILDER_REPO=""
+# ### shared g3-cache is outside the Docker building context
+# export SHARED_G3_CACHE_PATH=""
+# ### 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
+# # export FEATURES_NOVNC=0
+# # export FEATURES_FIREFOX_PLUS=0
+# # export FEATURES_OVERRIDING_ENVV=0
+
+#endregion
+
+
+#region Production environment
+
+### ----------------------
+### production environment
+### ----------------------
+
+# ### owner of Docker Hub repos
+export REPO_OWNER_NAME="repo.aknlw.com"
+# ### production builder gist
+# export GIST_ID=""
+# ### produktion deployment gist
+# export DEPLOY_GIST_ID=""
+# ### note that the reserved repository name 'void' will prohibit the publishing
+# ### primary deployment repos
+export DEPLOYMENT_REPO="repo.aknlw.com"
+export DEPLOYMENT_REPO_CHROMIUM="akanealw/debian-vnc-xfce-chromium"
+export DEPLOYMENT_REPO_FIREFOX="akanealw/debian-vnc-xfce-firefox"
+# ### builder repo can be a secondary deployment repo (if FORCE_PUBLISHING_BUILDER_REPO=1)
+export BUILDER_REPO="akanealw/debian-vnc-xfce"
+# ### shared g3-cache is outside the Docker building context
+# export SHARED_G3_CACHE_PATH=""
+# ### 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
+# # export FEATURES_NOVNC=0
+export FEATURES_FIREFOX_PLUS=0
+# # export FEATURES_OVERRIDING_ENVV=0
+
+#endregion
+
+
+#region Real secrets
+
+### ------------
+### REAL SECRETS
+### ------------
+
+### !!! REAL SECRET !!!
+### Gitea: Settings/Developer settings/Personal access tokens
+### this PAT must have the 'gist' scope
+### warning! this gist token is valid for all gits of the same owner!
+# export GIST_TOKEN=""
+
+### !!! REAL SECRETS !!!
+### Docker Hub credentials
+### warning! this credentials are valid for all Docker Hub repositories of the same owner!
+# export DOCKERHUB_USERNAME=""
+# export DOCKERHUB_PASSWORD=""
+
+#endregion
--- a/docker/hooks/util.rc
+++ b/docker/hooks/util.rc
--- a/docker/src/home/.bashrc
+++ b/docker/src/home/.bashrc
@@ -0,0 +1,18 @@
+### some examples of custom aliases
+
+alias ll="ls -l"
+
+### clear terminal window
+alias cls='printf "\033c"'
+
+### change terminal prompt text
+fn_ps1() {
+    if [ $# -gt 0 ] ; then
+        ### given value in bold green
+        PS1="\[\033[01;32m\]$1\[\033[00m\]> "
+    else
+        ### basename of the current working directory in bold blue
+        PS1='\[\033[01;34m\]\W\[\033[00m\]> '
+    fi
+}
+alias ps1='fn_ps1'
--- a/docker/src/tests/test-01.sh
+++ b/docker/src/tests/test-01.sh
--- a/docker/src/xfce-startup/help.rc
+++ b/docker/src/xfce-startup/help.rc
--- a/docker/src/xfce-startup/parser.rc
+++ b/docker/src/xfce-startup/parser.rc
--- a/docker/src/xfce-startup/set_user_permissions.sh
+++ b/docker/src/xfce-startup/set_user_permissions.sh
--- a/docker/src/xfce-startup/startup.sh
+++ b/docker/src/xfce-startup/startup.sh
--- a/docker/src/xfce-startup/user_generator.rc
+++ b/docker/src/xfce-startup/user_generator.rc
--- a/docker/src/xfce-startup/version_of.sh
+++ b/docker/src/xfce-startup/version_of.sh
--- a/docker/src/xfce-startup/version_sticker.sh
+++ b/docker/src/xfce-startup/version_sticker.sh
--- a/docker/src/xfce-startup/vnc_startup.rc
+++ b/docker/src/xfce-startup/vnc_startup.rc
--- a/docker/xfce-chromium/README-dockerhub.md
+++ b/docker/xfce-chromium/README-dockerhub.md
--- a/docker/xfce-chromium/README.md
+++ b/docker/xfce-chromium/README.md
--- a/docker/xfce-chromium/readme-append.template
+++ b/docker/xfce-chromium/readme-append.template
--- a/docker/xfce-chromium/src/home/Desktop/chromium.desktop
+++ b/docker/xfce-chromium/src/home/Desktop/chromium.desktop
--- a/docker/xfce-chromium/src/home/readme-chromium.md
+++ b/docker/xfce-chromium/src/home/readme-chromium.md
--- a/docker/xfce-firefox/README-dockerhub.md
+++ b/docker/xfce-firefox/README-dockerhub.md
--- a/docker/xfce-firefox/README.md
+++ b/docker/xfce-firefox/README.md
--- a/docker/xfce-firefox/readme-append.template
+++ b/docker/xfce-firefox/readme-append.template
--- a/docker/xfce-firefox/src/firefox.plus/home/Desktop/Copy
+++ b/docker/xfce-firefox/src/firefox.plus/home/Desktop/Copy
--- a/docker/xfce-firefox/src/firefox.plus/home/Desktop/FF
+++ b/docker/xfce-firefox/src/firefox.plus/home/Desktop/FF
--- a/docker/xfce-firefox/src/firefox.plus/home/readme-firefox-plus.md
+++ b/docker/xfce-firefox/src/firefox.plus/home/readme-firefox-plus.md
--- a/docker/xfce-firefox/src/firefox.plus/resources/accetto.svg
+++ b/docker/xfce-firefox/src/firefox.plus/resources/accetto.svg
--- 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
--- a/docker/xfce-firefox/src/firefox.plus/resources/user.js
+++ b/docker/xfce-firefox/src/firefox.plus/resources/user.js
--- a/docker/xfce-firefox/src/home/Desktop/firefox-esr.desktop
+++ b/docker/xfce-firefox/src/home/Desktop/firefox-esr.desktop
--- a/docker/xfce/README-dockerhub.md
+++ b/docker/xfce/README-dockerhub.md
--- a/docker/xfce/README.md
+++ b/docker/xfce/README.md
--- a/docker/xfce/readme-append.template
+++ b/docker/xfce/readme-append.template
--- a/docker/xfce/src/home/Desktop/versionsticker.desktop
+++ b/docker/xfce/src/home/Desktop/versionsticker.desktop
--- a/docker/xfce/src/home/config/xfce4/terminal/terminalrc
+++ b/docker/xfce/src/home/config/xfce4/terminal/terminalrc
--- a/docker/xfce/src/home/config/xfce4/xfconf/xfce-perchannel-xml/keyboard-layout.xml
+++ b/docker/xfce/src/home/config/xfce4/xfconf/xfce-perchannel-xml/keyboard-layout.xml
--- a/docker/xfce/src/home/config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
+++ b/docker/xfce/src/home/config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
--- a/docker/xfce/src/home/config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
+++ b/docker/xfce/src/home/config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
--- a/docker/xfce/src/home/readme.md
+++ b/docker/xfce/src/home/readme.md
--- a/examples/Dockerfile.extend
+++ b/examples/Dockerfile.extend
--- a/examples/example-override-envv.rc
+++ b/examples/example-override-envv.rc
--- a/examples/example-secrets.rc
+++ b/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
--- a/examples/example.yml
+++ b/examples/example.yml
--- a/readme-builder.md
+++ b/readme-builder.md
--- a/readme-ci-builder.md
+++ b/readme-ci-builder.md
--- a/readme-g3-cache.md
+++ b/readme-g3-cache.md
--- a/readme-local-building-example.md
+++ b/readme-local-building-example.md
--- a/utils/readme-util-readme-examples.md
+++ b/utils/readme-util-readme-examples.md
--- a/utils/util-readme.sh
+++ b/utils/util-readme.sh
Author	SHA1	Message	Date
akanealw	d6a0039cda	Merge branch 'master' of https://gitea.akanealw.com/akanealw/debian-vnc-xfce-g3	2024-04-01 22:37:53 +00:00
akanealw	824f644575	scripts to build	2024-04-01 22:37:31 +00:00
akanealw	e1b16e2d2b	testing	2024-03-29 03:26:57 -05:00
akanealw	30f7683720	corrected tag and customized dockerfiles	2024-01-30 07:16:49 -06:00
akanealw	0c4e90b0ae	added build scripts	2024-01-30 07:05:32 -06:00
akanealw	c8046f0424	edited and moved secrets file	2024-01-30 06:59:58 -06:00
akanealw	b8ec8e4c7e	changed variables	2024-01-29 20:21:37 -06:00
akanealw	aa7ac5670c	changed secrets	2024-01-29 20:18:30 -06:00
akanealw	4d6be40370	removed secrets filters	2024-01-29 20:01:07 -06:00
akanealw	0edb92f1de	exclude secrets files	2024-01-29 19:47:43 -06:00
akanealw	71ecf06dd8	changed executables	2024-01-29 19:43:18 -06:00
accetto	93515c7dfa	Release 23.12	2023-12-06 17:25:37 +01:00
accetto	bdacf64e1d	Release 23.11	2023-11-19 11:04:50 +01:00
accetto	5222ada048	more die-fast error handling	2023-11-19 09:54:19 +01:00
accetto	1498941651	added default 'bashrc'	2023-11-19 09:52:51 +01:00
accetto	fb8a52cd7a	just cosmetics	2023-08-19 12:17:21 +02:00
accetto	ac70dbfc74	CHANGELOG updated	2023-08-19 10:38:15 +02:00
accetto	39e366dea2	ci-builder.sh: pivotal group extended	2023-08-19 10:36:48 +02:00