diff --git a/Dockerfile b/Dockerfile index a5f0702..1322426 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM git.zontreck.com/ariascreations/conanservermanager:builddeps AS BUILDER +FROM git.zontreck.com/ariascreations/buildenvironments:flutter AS BUILDER # Obtain the Flutter SDK WORKDIR /app COPY . . @@ -8,7 +8,7 @@ WORKDIR /app RUN PATH=$PATH:/flutter/bin /bin/bash /app/compile.sh -FROM git.zontreck.com/ariascreations/conanservermanager:builddeps AS RCONBUILD +FROM git.zontreck.com/ariascreations/buildenvironments:debian AS RCONBUILD WORKDIR /app diff --git a/Jenkinsfile b/Jenkinsfile index 21ea3f6..b1e54da 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -48,9 +48,6 @@ pipeline { sh ''' #!/bin/bash - docker build -t git.zontreck.com/ariascreations/conanservermanager:builddeps docker_images/builddeps - docker push git.zontreck.com/ariascreations/conanservermanager:builddeps - docker build -t git.zontreck.com/ariascreations/conanservermanager:stable $(pwd) docker push git.zontreck.com/ariascreations/conanservermanager:stable diff --git a/compile.sh b/compile.sh index 0002066..89fc033 100755 --- a/compile.sh +++ b/compile.sh @@ -21,14 +21,6 @@ if [ -f RELEASE ] then docker login git.zontreck.com - if [ -f RELEASE.DEPS ] - then - docker build -t git.zontreck.com/ariascreations/conanservermanager:builddeps docker_images/builddeps - docker push git.zontreck.com/ariascreations/conanservermanager:builddeps - - rm RELEASE.DEPS - fi - docker build -t git.zontreck.com/ariascreations/conanservermanager:stable $(pwd) docker push git.zontreck.com/ariascreations/conanservermanager:stable diff --git a/docker_images/builddeps/Dockerfile b/docker_images/builddeps/Dockerfile deleted file mode 100644 index 584835d..0000000 --- a/docker_images/builddeps/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM ghcr.io/parkervcp/yolks:debian - - -WORKDIR / -USER 0 - -RUN apt-get update -RUN apt-get upgrade -y -RUN apt-get install -y git wget curl unzip xz-utils zip libglu1-mesa clang cmake -RUN apt-get install -y ninja-build pkg-config liblzma-dev libstdc++-12-dev rsync - -RUN wget -O flutter.tar.xz https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.24.1-stable.tar.xz -RUN tar -xvf flutter.tar.xz - -RUN git config --global --add safe.directory /flutter \ No newline at end of file