AriasCreations/ConanServerManager
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update dockerfile to use a pre-existing flutter env

Browse source
This commit is contained in:
zontreck 2024-08-29 19:21:20 -07:00
parent 4d54d23b5b
commit 8fcb708fd1
4 changed files with 2 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile
View file

@ -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 # Obtain the Flutter SDK
WORKDIR /app WORKDIR /app
COPY . . COPY . .
@ -8,7 +8,7 @@ WORKDIR /app
RUN PATH=$PATH:/flutter/bin /bin/bash /app/compile.sh 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 WORKDIR /app

3
Jenkinsfile vendored
View file

@ -48,9 +48,6 @@ pipeline {
sh ''' sh '''
#!/bin/bash #!/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 build -t git.zontreck.com/ariascreations/conanservermanager:stable $(pwd)
docker push git.zontreck.com/ariascreations/conanservermanager:stable docker push git.zontreck.com/ariascreations/conanservermanager:stable

8
compile.sh
View file

@ -21,14 +21,6 @@ if [ -f RELEASE ]
then then
docker login git.zontreck.com 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 build -t git.zontreck.com/ariascreations/conanservermanager:stable $(pwd)
docker push git.zontreck.com/ariascreations/conanservermanager:stable docker push git.zontreck.com/ariascreations/conanservermanager:stable

15
docker_images/builddeps/Dockerfile
View file

@ -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