From 244a69d1aad25c500e2596ed8b80913ae22950b9 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Wed, 9 Mar 2022 22:53:37 -0500 Subject: [PATCH] Move CI Dockerfile --- Jenkinsfile | 2 +- Dockerfile.build => scripts/ci/Dockerfile | 0 scripts/ci/simulate.sh | 2 +- scripts/install-dependencies.sh | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename Dockerfile.build => scripts/ci/Dockerfile (100%) diff --git a/Jenkinsfile b/Jenkinsfile index 21c523219..c0af3c7fe 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ pipeline { stage('Debian Bullseye') { agent { docker { - filename 'Dockerfile.build' + filename 'scripts/ci/Dockerfile' args '-v /var/run/docker.sock:/var/run/docker.sock' } } diff --git a/Dockerfile.build b/scripts/ci/Dockerfile similarity index 100% rename from Dockerfile.build rename to scripts/ci/Dockerfile diff --git a/scripts/ci/simulate.sh b/scripts/ci/simulate.sh index 0250b2120..f1e8fa602 100755 --- a/scripts/ci/simulate.sh +++ b/scripts/ci/simulate.sh @@ -3,7 +3,7 @@ set -e # Build Docker Image -docker build -f Dockerfile.build -t minecraft-pi-reborn-build . +docker build -f scripts/ci/Dockerfile -t minecraft-pi-reborn-build . # Run docker run --rm -v "$(pwd):/data" -w '/data' -u '1000:1000' minecraft-pi-reborn-build ./scripts/ci/run.sh diff --git a/scripts/install-dependencies.sh b/scripts/install-dependencies.sh index 83e63038c..8b66516b8 100755 --- a/scripts/install-dependencies.sh +++ b/scripts/install-dependencies.sh @@ -99,4 +99,4 @@ sudo rm -f /usr/local/bin/appimagetool sudo ln -s /opt/appimagetool.AppDir/AppRun /usr/local/bin/appimagetool # Install appimage-builder -sudo pip3 install git+https://github.com/AppImageCrafters/appimage-builder.git +sudo pip3 install 'git+https://github.com/AppImageCrafters/appimage-builder.git'