rebase to focal

aptalca · aptalca · commit 24e81f29520d · 2021-11-29T13:00:15.000-05:00
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic
+FROM ghcr.io/linuxserver/baseimage-ubuntu:focal
 
 # set version label
 ARG BUILD_DATE
@@ -16,7 +16,7 @@ RUN \
   apt-get install -y \
     gnupg && \
   curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
-  echo 'deb https://deb.nodesource.com/node_14.x bionic main' \
+  echo 'deb https://deb.nodesource.com/node_14.x focal main' \
     > /etc/apt/sources.list.d/nodesource.list && \
   curl -s https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
   echo 'deb https://dl.yarnpkg.com/debian/ stable main' \
@@ -27,8 +27,8 @@ RUN \
     build-essential \
     libx11-dev \
     libxkbfile-dev \
-    libsecret-1-dev \
-    pkg-config && \
+    pkg-config \
+    python3 && \
   echo "**** install runtime dependencies ****" && \
   apt-get install -y \
     git \
@@ -44,6 +44,7 @@ RUN \
     | jq -r '."dist-tags".latest' | sed 's|^|v|'); \
   fi && \
   CODE_VERSION=$(echo "$CODE_RELEASE" | awk '{print substr($1,2); }') && \
+  npm config set python python3 \
   yarn config set network-timeout 600000 -g && \
   yarn --production --verbose --frozen-lockfile global add code-server@"$CODE_VERSION" && \
   yarn cache clean && \
@@ -56,6 +57,7 @@ RUN \
     pkg-config && \
   apt-get clean && \
   rm -rf \
+    /config/* \
     /tmp/* \
     /var/lib/apt/lists/* \
     /var/tmp/*
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal
 
 # set version label
 ARG BUILD_DATE
@@ -16,7 +16,7 @@ RUN \
   apt-get install -y \
     gnupg && \
   curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
-  echo 'deb https://deb.nodesource.com/node_14.x bionic main' \
+  echo 'deb https://deb.nodesource.com/node_14.x focal main' \
     > /etc/apt/sources.list.d/nodesource.list && \
   curl -s https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
   echo 'deb https://dl.yarnpkg.com/debian/ stable main' \
@@ -27,8 +27,8 @@ RUN \
     build-essential \
     libx11-dev \
     libxkbfile-dev \
-    libsecret-1-dev \
-    pkg-config && \
+    pkg-config \
+    python3 && \
   echo "**** install runtime dependencies ****" && \
   apt-get install -y \
     git \
@@ -44,6 +44,7 @@ RUN \
     | jq -r '."dist-tags".latest' | sed 's|^|v|'); \
   fi && \
   CODE_VERSION=$(echo "$CODE_RELEASE" | awk '{print substr($1,2); }') && \
+  npm config set python python3 \
   yarn config set network-timeout 600000 -g && \
   yarn --production --verbose --frozen-lockfile global add code-server@"$CODE_VERSION" && \
   yarn cache clean && \
@@ -56,6 +57,7 @@ RUN \
     pkg-config && \
   apt-get clean && \
   rm -rf \
+    /config/* \
     /tmp/* \
     /var/lib/apt/lists/* \
     /var/tmp/*
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-bionic
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal
 
 # set version label
 ARG BUILD_DATE
@@ -16,7 +16,7 @@ RUN \
   apt-get install -y \
     gnupg && \
   curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
-  echo 'deb https://deb.nodesource.com/node_14.x bionic main' \
+  echo 'deb https://deb.nodesource.com/node_14.x focal main' \
     > /etc/apt/sources.list.d/nodesource.list && \
   curl -s https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
   echo 'deb https://dl.yarnpkg.com/debian/ stable main' \
@@ -27,8 +27,8 @@ RUN \
     build-essential \
     libx11-dev \
     libxkbfile-dev \
-    libsecret-1-dev \
-    pkg-config && \
+    pkg-config \
+    python3 && \
   echo "**** install runtime dependencies ****" && \
   apt-get install -y \
     git \
@@ -44,6 +44,7 @@ RUN \
     | jq -r '."dist-tags".latest' | sed 's|^|v|'); \
   fi && \
   CODE_VERSION=$(echo "$CODE_RELEASE" | awk '{print substr($1,2); }') && \
+  npm config set python python3 \
   yarn config set network-timeout 600000 -g && \
   yarn --production --verbose --frozen-lockfile global add code-server@"$CODE_VERSION" && \
   yarn cache clean && \
@@ -56,6 +57,7 @@ RUN \
     pkg-config && \
   apt-get clean && \
   rm -rf \
+    /config/* \
     /tmp/* \
     /var/lib/apt/lists/* \
     /var/tmp/*
diff --git a/README.md b/README.md
@@ -70,7 +70,7 @@ This image provides various versions that are available via tags. `latest` tag u
 | Tag | Description |
 | :----: | --- |
 | latest | Stable releases |
-| focal | Stable releases, based on Ubuntu Focal |
+| focal | DEPRECATED (no longer updated, `latest` is rebased on focal) - Stable releases, based on Ubuntu Focal |
 | development | DEPRECATED (no longer updated) - Prereleases from their GitHub |
 
 ## Application Setup
@@ -262,6 +262,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **29.11.21:** - Rebase to Ubuntu focal.
 * **16.09.21:** - Fix slow `chown` on large workspace (contents of workspace folder no longer chowned).
 * **11.07.21:** - Bump node to 14 to fix builds
 * **08.05.21:** - Fix doc link
diff --git a/readme-vars.yml b/readme-vars.yml
@@ -29,7 +29,7 @@ available_architectures:
 development_versions: true
 development_versions_items:
   - { tag: "latest", desc: "Stable releases" }
-  - { tag: "focal", desc: "Stable releases, based on Ubuntu Focal" }
+  - { tag: "focal", desc: "DEPRECATED (no longer updated, `latest` is rebased on focal) - Stable releases, based on Ubuntu Focal" }
   - { tag: "development", desc: "DEPRECATED (no longer updated) - Prereleases from their GitHub" }
 
 # container parameters
@@ -76,6 +76,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "29.11.21:", desc: "Rebase to Ubuntu focal." }
   - { date: "16.09.21:", desc: "Fix slow `chown` on large workspace (contents of workspace folder no longer chowned)." }
   - { date: "11.07.21:", desc: "Bump node to 14 to fix builds" }
   - { date: "08.05.21:", desc: "Fix doc link" }
diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config
@@ -17,6 +17,11 @@ if [ -n "${SUDO_PASSWORD}" ] || [ -n "${SUDO_PASSWORD_HASH}" ]; then
     fi
 fi
 
+[[ ! -f /config/.bashrc ]] && \
+    cp /root/.bashrc /config/.bashrc
+[[ ! -f /config/.profile ]] && \
+    cp /root/.profile /config/.profile
+
 # permissions
 if [ -f "/usr/bin/find" ] && [ -f "/usr/bin/xargs" ]; then
     CORES=$(nproc --all)
