Remove additional_contexts usage

dimikot · Mar 2, 2024 · 503058b · 503058b
1 parent 8a5cf31
commit 503058b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/docker/compose.yml b/docker/compose.yml
@@ -16,8 +16,6 @@ services:
   self-hosted-runner:
     build:
       context: self-hosted-runner
-      additional_contexts:
-        root: ..
       dockerfile: Dockerfile
     depends_on:
       ci-storage-host:

diff --git a/docker/self-hosted-runner/Dockerfile b/docker/self-hosted-runner/Dockerfile
@@ -32,16 +32,18 @@ RUN true \
     && curl --no-progress-meter -L https://github.com/actions/runner/releases/download/v$RUNNER_VERSION/actions-runner-$arch-$RUNNER_VERSION.tar.gz | tar xz
 
 USER root
-RUN ~user/actions-runner/bin/installdependencies.sh \
+RUN true \
+    && ~user/actions-runner/bin/installdependencies.sh \
     && apt-get autoremove \
     && apt-get clean \
     && apt-get autoclean \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/* \
+    && curl https://raw.githubusercontent.com/dimikot/ci-storage/main/ci-storage > /usr/bin/ci-storage \
+    && chmod 755 /usr/bin/ci-storage
 
-USER user
 COPY --chmod=755 --chown=user:user entrypoint.sh /home/user
-COPY --chmod=755 --from=root ci-storage /usr/bin/ci-storage
 
+USER user
 WORKDIR /home/user
 ENTRYPOINT ["./entrypoint.sh"]