Merge pull request #561 from strg-at/bugfix/INPRO-3058-fix-docker-configuration

bugfix(gcloud-workstation): Changing storage driver to fuse-overlayfs, INPRO-3058

Author: mickaelstrg

gcloud-workstation-phpstorm/Dockerfile

@@ -29,6 +29,8 @@ RUN install -m 0755 -d /etc/apt/keyrings \
   $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
   tee /etc/apt/sources.list.d/docker.list > /dev/null
 
+COPY ./config/docker/daemon.json /etc/docker/daemon.json
+
 # preparing google sdk installation
 RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor -o /usr/share/keyrings/cloud.google.gpg \
   && echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
@@ -60,6 +62,7 @@ RUN apt update && add-apt-repository ppa:git-core/ppa -y && DEBIAN_FRONTEND=noni
   docker-ce-cli \
   docker-compose-plugin \
   flux \
+  fuse-overlayfs \
   gettext-base \
   git \
   gnupg \

gcloud-workstation-phpstorm/config/docker/daemon.json

@@ -0,0 +1,11 @@
+{
+  "storage-driver": "fuse-overlayfs",
+  "features": {
+    "buildkit": true
+  },
+  "builder": {
+    "gc": {
+      "enabled": true
+    }
+  }
+}

gcloud-workstation-phpstorm/scripts/998_create_docker_directory.sh

@@ -1,3 +1,7 @@
 #!/bin/bash
 pkill docker || true # kills any running docker processes
-mkdir -p /home/user/docker # creates the docker directory in the home directory
+mkdir -p /home/user/docker/buildkit # creates the docker & buildkit directories in the home directory
+cat<<EOF>/home/user/docker/buildkit/buildkitd.toml # required to use fuse-overlayfs
+[worker.oci]
+  snapshotter = "native"
+EOF

gcloud-workstation-vscode/Dockerfile

@@ -29,6 +29,8 @@ RUN install -m 0755 -d /etc/apt/keyrings \
   $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
   tee /etc/apt/sources.list.d/docker.list > /dev/null
 
+COPY ./config/docker/daemon.json /etc/docker/daemon.json
+
 # preparing google sdk installation
 RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor -o /usr/share/keyrings/cloud.google.gpg \
   && echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
@@ -60,6 +62,7 @@ RUN apt update && add-apt-repository ppa:git-core/ppa -y && DEBIAN_FRONTEND=noni
   docker-ce-cli \
   docker-compose-plugin \
   flux \
+  fuse-overlayfs \
   gettext-base \
   git \
   gnupg \

gcloud-workstation-vscode/config/docker/daemon.json

@@ -0,0 +1,11 @@
+{
+  "storage-driver": "fuse-overlayfs",
+  "features": {
+    "buildkit": true
+  },
+  "builder": {
+    "gc": {
+      "enabled": true
+    }
+  }
+}

gcloud-workstation-vscode/scripts/998_create_docker_directory.sh

@@ -1,3 +1,7 @@
 #!/bin/bash
 pkill docker || true # kills any running docker processes
-mkdir -p /home/user/docker # creates the docker directory in the home directory
+mkdir -p /home/user/docker/buildkit # creates the docker & buildkit directories in the home directory
+cat<<EOF>/home/user/docker/buildkit/buildkitd.toml # required to use fuse-overlayfs
+[worker.oci]
+  snapshotter = "native"
+EOF