do not repull roles on docker build

etkecc · Sep 11, 2024 · 6a9e101 · 6a9e101
1 parent 2fb4d52
commit 6a9e101
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 14 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -3,7 +3,6 @@ on:
   push:
     branches: [ "main", "fresh" ]
 env:
-  agru: "v0.1.12"
   alpine: "3.20"
   ansible: "10.4.0"
   ansible_core: "2.17.4"
@@ -42,7 +41,6 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
-            AGRU=${{ env.agru }}
             ALPINE=${{ env.alpine }}
             ANSIBLE=${{ env.ansible }}
             ANSIBLE_CORE=${{ env.ansible_core }}
@@ -80,7 +78,6 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
-            AGRU=${{ env.agru }}
             ALPINE=${{ env.alpine }}
             ANSIBLE=${{ env.ansible }}
             ANSIBLE_CORE=${{ env.ansible_core }}
@@ -139,7 +136,6 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
-            AGRU=${{ env.agru }}
             ALPINE=${{ env.alpine }}
             ANSIBLE=${{ env.ansible }}
             ANSIBLE_CORE=${{ env.ansible_core }}
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,6 @@ ARG ANSIBLE
 ARG ANSIBLE_CORE
 FROM ghcr.io/etkecc/ansible/base:${ALPINE}-${ANSIBLE_CORE}-${ANSIBLE}
 
-ENV AGRU_CLEANUP="-c=false"
 ENV ANSIBLE_LOG_PATH=" "
 WORKDIR /playbook
 ENTRYPOINT ["/bin/sh"]
@@ -12,6 +11,6 @@ COPY . /playbook
 # Then initialize /upstream from submodules, and get rid of the `.git` directory.
 # We don't need to carry that extra weight into the final image.
 RUN git rev-parse HEAD > /playbook/source-commit && \
-    just pull-dependencies && \
+    git submodule update --init --recursive && \
     rm -rf /playbook/.git && \
     rm -rf /playbook/upstream/.git
diff --git a/Dockerfile.base b/Dockerfile.base
@@ -1,18 +1,11 @@
 ARG ALPINE
-FROM ghcr.io/etkecc/base/build AS builder
-ARG AGRU
-ENV GOPROXY=""
-RUN git clone --depth 1 -b $AGRU https://github.com/etkecc/agru.git && \
-    cd agru && just build && mv agru /usr/bin/agru
-
 FROM alpine:${ALPINE}
 ARG ANSIBLE
 ARG ANSIBLE_CORE
 ENV PATH="/usr/local/bin:/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin"
 
-COPY --from=builder /usr/bin/agru /usr/bin/agru
 RUN apk --no-cache add python3 py3-cryptography py3-jinja2 py3-packaging py3-paramiko py3-resolvelib py3-passlib py3-yaml \
-		git just openssh hugo && \
+		git openssh hugo && \
 		apk --no-cache add --virtual builddeps alpine-sdk py3-pip && \
 		ln -s /bin/uname /usr/local/bin/uname && \
 		ln -s /bin/rm /usr/local/bin/rm && \