diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 311bea9..433b443 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -49,7 +49,6 @@ jobs: tags: ${{ github.ref_name }} context: ./containers/fedora containerfiles: ./containers/fedora/Containerfile - oci: true - name: Push uses: redhat-actions/push-to-registry@v2 with: @@ -97,7 +96,6 @@ jobs: context: ./containers/${{ matrix.container }} containerfiles: ./containers/${{ matrix.container }}/Containerfile build-args: TAG=${{ github.ref_name }} - oci: true - name: Push if: steps.check.outputs.run == 'true' uses: redhat-actions/push-to-registry@v2 diff --git a/containers/fedora/Containerfile b/containers/fedora/Containerfile index 38ebca9..9d686a3 100644 --- a/containers/fedora/Containerfile +++ b/containers/fedora/Containerfile @@ -8,18 +8,3 @@ RUN dnf update -y && \ zoxide git npm neovim awk jq unzip fd-find lazygit && \ dnf clean all -# === setup user === -RUN useradd -ms /bin/bash user && \ - echo 'user ALL=NOPASSWD: ALL' > /etc/sudoers && \ - mkdir -p /run/user/1000 && chown user:user /run/user/1000 - -USER user -WORKDIR /home/user - -RUN mkdir .config .local .cache && \ - git clone https://git.plabble.org/Job79/neovim-config.git .config/nvim -COPY --chown=user:user config/bashrc .bashrc -COPY --chown=user:user config/git .config/git/config -COPY config/bin /usr/local/bin - -VOLUME /home/user diff --git a/containers/infra/Containerfile b/containers/infra/Containerfile index 810f10e..c9e28fe 100644 --- a/containers/infra/Containerfile +++ b/containers/infra/Containerfile @@ -2,10 +2,9 @@ ARG TAG FROM job79/fedora:${TAG} USER root -RUN dnf -y install kubectl k9s openssl age "$(curl -s https://api.github.com/repos/getsops/sops/releases/latest | jq -r '.assets[] | select(.name | test("sops-.*.x86_64.rpm$")) | .browser_download_url')" && \ +RUN dnf -y install kubectl k9s openssl age curl which && \ dnf clean all && \ curl -sL https://talos.dev/install | sh && \ - curl -s https://fluxcd.io/install.sh | bash && \ - chmod 755 /run + curl -s https://fluxcd.io/install.sh | bash USER user