Skip to content

Commit

Permalink
remove docker from build
Browse files Browse the repository at this point in the history
  • Loading branch information
awesomekyle committed Apr 6, 2024
1 parent 796179d commit b7f5d76
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 39 deletions.
7 changes: 1 addition & 6 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,6 @@ COPY workarounds.sh \
image-info.sh \
/tmp

# Apply IP Forwarding before installing Docker to prevent messing with LXC networking
RUN sysctl -p

RUN wget https://copr.fedorainfracloud.org/coprs/ganto/lxc4/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo && \
wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo && \
wget https://copr.fedorainfracloud.org/coprs/karmab/kcli/repo/fedora-"${FEDORA_MAJOR_VERSION}"/karmab-kcli-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/karmab-kcli-fedora-"${FEDORA_MAJOR_VERSION}".repo && \
Expand All @@ -160,8 +157,7 @@ RUN curl -Lo ./kind "https://github.com/kubernetes-sigs/kind/releases/latest/dow
mv ./kind /usr/bin/kind

# Set up services
RUN systemctl enable docker.socket && \
systemctl enable podman.socket && \
RUN systemctl enable podman.socket && \
systemctl enable swtpm-workaround.service && \
systemctl enable bluefin-dx-groups.service && \
systemctl enable --global bluefin-dx-user-vscode.service && \
Expand All @@ -176,7 +172,6 @@ RUN rm -f /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".rep
rm -f /etc/yum.repos.d/karmab-kcli-fedora-"${FEDORA_MAJOR_VERSION}".repo && \
rm -f /etc/yum.repos.d/atim-ubuntu-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo && \
rm -f /etc/yum.repos.d/vscode.repo && \
rm -f /etc/yum.repos.d/docker-ce.repo && \
rm -f /etc/yum.repos.d/_copr:copr.fedorainfracloud.org:phracek:PyCharm.repo && \
rm -f /etc/yum.repos.d/fedora-cisco-openh264.repo && \
fc-cache --system-only --really-force --verbose && \
Expand Down
6 changes: 0 additions & 6 deletions dx/etc/yum.repos.d/docker-ce.repo

This file was deleted.

1 change: 0 additions & 1 deletion dx/usr/bin/bluefin-dx-groups
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ fi
wheelarray=($(getent group wheel | cut -d ":" -f 4 | tr ',' '\n'))
for user in $wheelarray
do
usermod -aG docker $user
usermod -aG incus-admin $user
usermod -aG lxd $user
usermod -aG libvirt $user
Expand Down
1 change: 0 additions & 1 deletion dx/usr/bin/bluefin-dx-user-vscode
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ fi
# Pre-install preferred VSCode Extensions
code --install-extension ms-vscode-remote.remote-containers
code --install-extension ms-vscode-remote.remote-ssh
code --install-extension ms-azuretools.vscode-docker

# Prevent future executions
echo "Writing state file"
Expand Down
41 changes: 21 additions & 20 deletions dx/usr/bin/bluefin-incus
Original file line number Diff line number Diff line change
Expand Up @@ -50,28 +50,29 @@ else
echo "root:1000:1" | sudo tee -a /etc/subuid
fi

# No longer needed: https://github.com/ganto/copr-lxc4/issues/41
# check to see if SELinux is set to permissive or disabled

echo ""
echo "Checking SELinux status"
SELINUX_STATUS=$(getenforce)

if [ "$SELINUX_STATUS" = "Enforcing" ]
then
echo ""
echo "SELinux must be set to Permissive or Disabled to enable Incus"
echo "Choose your new SELinux state:"
OPTION=$(gum choose Permissive Disabled Cancel)
if [ "$OPTION" = "Cancel" ]
then
echo "You have chosen to cancel the Incus installation process"
exit
else
sudo setenforce $OPTION
echo "You must reboot before continuing. You can run this script again."
exit
fi
fi
# echo ""
# echo "Checking SELinux status"
# SELINUX_STATUS=$(getenforce)

# if [ "$SELINUX_STATUS" = "Enforcing" ]
# then
# echo ""
# echo "SELinux must be set to Permissive or Disabled to enable Incus"
# echo "Choose your new SELinux state:"
# OPTION=$(gum choose Permissive Disabled Cancel)
# if [ "$OPTION" = "Cancel" ]
# then
# echo "You have chosen to cancel the Incus installation process"
# exit
# else
# sudo setenforce $OPTION
# echo "You must reboot before continuing. You can run this script again."
# exit
# fi
# fi

# create necessary directories for lxcfs and incus

Expand Down
1 change: 0 additions & 1 deletion dx/usr/lib/sysctl.d/docker-ce.conf

This file was deleted.

2 changes: 1 addition & 1 deletion dx/usr/lib/systemd/system/bluefin-dx-groups.service
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[Unit]
Description=Add wheel members to docker,incus-admin, and lxd groups
Description=Add wheel members to incus-admin and lxd groups

[Service]
Type=oneshot
Expand Down
5 changes: 2 additions & 3 deletions just/bluefin-system.just
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,9 @@ ptyxis-transparency opacity="0.95":
printf "Value must be between 0 and 1: %s.\n" "{{ opacity }}"
fi
# Configure docker,incus-admin,lxd,libvirt container manager permissions
# Configure incus-admin,lxd,libvirt container manager permissions
dx-group:
sudo usermod -aG docker $USER
sudo usermod -aG incus-admin $USER
sudo usermod -aG lxd $USER
sudo usermod -aG libvirt $USER
@echo "Logout to use docker, incus-admin, lxd, libvirt"
@echo "Logout to use incus-admin, lxd, libvirt"

0 comments on commit b7f5d76

Please sign in to comment.