Skip to content

Commit

Permalink
Install Docker Desktop again
Browse files Browse the repository at this point in the history
  • Loading branch information
samhclark committed Aug 18, 2024
1 parent 0082a77 commit e4cd629
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 9 deletions.
27 changes: 18 additions & 9 deletions Containerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,26 @@
FROM quay.io/fedora-ostree-desktops/silverblue:40 as docker-desktop-rpm
COPY checksums checksums
ADD https://desktop.docker.com/linux/main/amd64/160616/docker-desktop-x86_64.rpm docker-desktop-x86_64.rpm
RUN sha256sum -c checksums

FROM quay.io/fedora-ostree-desktops/silverblue:40 as silverblue

COPY docker-ce.repo /etc/yum.repos.d/docker-ce.repo
COPY vscode.repo /etc/yum.repos.d/vscode.repo
COPY custom-origin.yaml /etc/rpm-ostree/origin.d/custom-origin.yaml
COPY checksums /tmp/checksums

ADD https://desktop.docker.com/linux/main/amd64/160616/docker-desktop-x86_64.rpm /tmp/docker-desktop-x86_64.rpm
RUN rpm-ostree ex rebuild \
&& systemctl enable rpm-ostreed-automatic.timer

# Copying this pattern from here https://github.com/coreos/rpm-ostree/issues/233#issuecomment-1301194050
# There have been updates since this was written in Nov 2022 but as of July 2024, this is still the
# recommended way https://github.com/coreos/fedora-coreos-tracker/issues/1681#issuecomment-2211137520
COPY --from=docker-desktop-rpm docker-desktop-x86_64.rpm docker-desktop-x86_64.rpm
RUN mkdir /var/opt \
&& rpm -Uvh docker-desktop-x86_64.rpm \
&& mv /var/opt/docker-desktop /usr/lib/opt/docker-desktop \
&& echo 'L /opt/docker-desktop - - - - ../../usr/lib/opt/docker-desktop' > /usr/lib/tmpfiles.d/docker-desktop.conf \
&& rm -f docker-desktop-x86_64.rpm

RUN cd /tmp && sha256sum -c checksums \
&& rpm-ostree ex rebuild \
&& rpm-ostree install --cache-only /tmp/docker-desktop-x86_64.rpm \
&& rm -f /tmp/checksums \
&& rm -f /tmp/docker-desktop-x86_64.rpm \
&& systemctl enable rpm-ostreed-automatic.timer \
&& rpm-ostree cleanup -m \
RUN rpm-ostree cleanup -m \
&& ostree container commit
2 changes: 2 additions & 0 deletions custom-origin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@ packages:
- gnome-shell-extension-appindicator
- gnome-shell-extension-gsconnect
- gnome-tweaks
- gtk3-devel
- guestfs-tools
- libvirt-daemon-config-network
- libvirt-daemon-kvm
- openssh-askpass
- pass
- python3-libguestfs
- ptyxis
- qemu-kvm
Expand Down

0 comments on commit e4cd629

Please sign in to comment.