From 8cb112621380a2e53dc8569c7286ac4769e7d66d Mon Sep 17 00:00:00 2001 From: Nick Boldt Date: Mon, 17 Oct 2022 13:36:27 -0300 Subject: [PATCH 1/3] CRW-3397 switch from vfs to fuse-overlayfs; add note about pinning to go 1.16 for golangci-lint 1.44.0 (CRW-3117) Change-Id: Ib5fdfb77ebc5a58656615401a5faf1d4468d5454 Signed-off-by: Nick Boldt --- devspaces-udi/Dockerfile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/devspaces-udi/Dockerfile b/devspaces-udi/Dockerfile index 5a7529667a..2fbe2dd87e 100644 --- a/devspaces-udi/Dockerfile +++ b/devspaces-udi/Dockerfile @@ -7,6 +7,8 @@ # # Contributors: # Red Hat, Inc. - initial API and implementation + +# NOTE: this is pinned to 1.16 because golangci-lint 1.44.0 requires go 1.16; newer versions need 1.18 which is not avail in RHEC # https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8-minimal FROM registry-proxy.engineering.redhat.com/rh-osbs/rhel8-go-toolset:1.16.12-2 as go-builder @@ -127,7 +129,9 @@ RUN \ RUN dnf -y module enable container-tools:rhel8 && \ dnf -y -q update --exclude=odo && \ dnf -y reinstall shadow-utils && \ - dnf -y install podman buildah skopeo fuse-overlayfs + # CRW-3397 ensure fuse-overlayfs is installed BEFORE podman - https://github.com/containers/podman/blob/main/docs/tutorials/rootless_tutorial.md#ensure-fuse-overlayfs-is-installed + dnf -y install fuse-overlayfs && fuse-overlayfs -V && \ + dnf -y install podman buildah skopeo ## Rootless podman install #2 # Set up environment variables to note that this is @@ -149,11 +153,6 @@ RUN mkdir -p /var/lib/shared/overlay-images /var/lib/shared/overlay-layers; \ touch /var/lib/shared/overlay-images/images.lock; \ touch /var/lib/shared/overlay-layers/layers.lock -## Rootless podman install #5 -# But use VFS since we were not able to make Fuse work yet... -RUN mkdir -p "${HOME}"/.config/containers && \ - (echo '[storage]';echo 'driver = "vfs"') > "${HOME}"/.config/containers/storage.conf - RUN \ ######################################################################## # Java 8 11 17 From 105ae75fd87a5963a2f4a932213aae3545da6edd Mon Sep 17 00:00:00 2001 From: Nick Boldt Date: Tue, 18 Oct 2022 07:36:18 -0400 Subject: [PATCH 2/3] remove comment after merging https://github.com/redhat-developer/devspaces-images/pull/342 --- devspaces-udi/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/devspaces-udi/Dockerfile b/devspaces-udi/Dockerfile index 2fbe2dd87e..b54d8ea25e 100644 --- a/devspaces-udi/Dockerfile +++ b/devspaces-udi/Dockerfile @@ -8,7 +8,6 @@ # Contributors: # Red Hat, Inc. - initial API and implementation -# NOTE: this is pinned to 1.16 because golangci-lint 1.44.0 requires go 1.16; newer versions need 1.18 which is not avail in RHEC # https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8-minimal FROM registry-proxy.engineering.redhat.com/rh-osbs/rhel8-go-toolset:1.16.12-2 as go-builder From 0c5c7b1612fa1f5381171b1ce54ad1af8a36880c Mon Sep 17 00:00:00 2001 From: Nick Boldt Date: Tue, 18 Oct 2022 07:36:36 -0400 Subject: [PATCH 3/3] Update Dockerfile --- devspaces-udi/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/devspaces-udi/Dockerfile b/devspaces-udi/Dockerfile index b54d8ea25e..dd26380e99 100644 --- a/devspaces-udi/Dockerfile +++ b/devspaces-udi/Dockerfile @@ -7,7 +7,6 @@ # # Contributors: # Red Hat, Inc. - initial API and implementation - # https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8-minimal FROM registry-proxy.engineering.redhat.com/rh-osbs/rhel8-go-toolset:1.16.12-2 as go-builder