Merge pull request #9 from ublue-os/castrojo-patch-2

This commit is contained in:
Jorge O. Castro 2023-03-10 16:34:51 -05:00 committed by GitHub
commit 90a97d50df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 4 deletions

View file

@ -14,7 +14,6 @@ COPY usr /usr
RUN wget https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo -O /etc/yum.repos.d/terra.repo
RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/repo/fedora-$(rpm -E %fedora)/kylegospo-gnome-vrr-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo
RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/webapp-manager/repo/fedora-${FEDORA_MAJOR_VERSION}/kylegospo-webapp-manager-fedora-${FEDORA_MAJOR_VERSION}.repo -O /etc/yum.repos.d/kylegospo-webapp-manager-fedora-${FEDORA_MAJOR_VERSION}.repo
RUN rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:kylegospo:gnome-vrr mutter gnome-control-center gnome-control-center-filesystem
@ -30,7 +29,6 @@ RUN /tmp/build.sh \
rm -f /etc/yum.repos.d/terra.repo && \
rm -f /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo && \
rm -f /etc/yum.repos.d/tailscale.repo && \
rm -f /etc/yum.repos.d/kylegospo-webapp-manager-fedora-"${FEDORA_MAJOR_VERSION}".repo && \
sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/user.conf && \
sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/system.conf && \
rm -rf /tmp/* /var/* && \
@ -44,4 +42,4 @@ COPY --from=cgr.dev/chainguard/cosign:latest /usr/bin/cosign /usr/bin/cosign
RUN curl -Lo ./kind "https://kind.sigs.k8s.io/dl/v0.17.0/kind-$(uname)-amd64"
RUN chmod +x ./kind
RUN mv ./kind /usr/bin/kind
RUN mv ./kind /usr/bin/kind

View file

@ -15,7 +15,6 @@
"podman-compose",
"tailscale",
"wireguard-tools",
"webapp-manager",
"yaru-theme"
]
},