Move containers to a dedicated org path

This commit is contained in:
zontreck 2025-03-09 18:07:56 -07:00
parent fe8f7d2a11
commit da7e2210b7
21 changed files with 144 additions and 108 deletions

View file

@ -1,4 +1,4 @@
FROM git.zontreck.com/ariascreations/buildenvironments:debianbuild AS ADK
FROM git.zontreck.com/packages/debian:build AS ADK
ENV ANDROID_HOME "/opt/android-sdk-linux"
ENV ANDROID_SDK_VER 11076708
@ -10,7 +10,7 @@ RUN unzip -qq /commandlinetools-linux-${ANDROID_SDK_VER}_latest.zip -d $ANDROID_
RUN rm -v /commandlinetools-linux-${ANDROID_SDK_VER}_latest.zip
ADD packages.txt /
FROM git.zontreck.com/ariascreations/buildenvironments:debianbuild
FROM git.zontreck.com/packages/debian:build
ENV ANDROID_HOME "/opt/android-sdk-linux"
ENV ANDROID_SDK_VER 11076708

View file

@ -1,4 +1,4 @@
FROM git.zontreck.com/ariascreations/buildenvironments:flutter
FROM git.zontreck.com/packages/flutter:latest

View file

@ -1,4 +1,4 @@
FROM git.zontreck.com/ariascreations/buildenvironments:archdev
FROM git.zontreck.com/packages/arch:build
ENV ARCHAGENT NAN

View file

@ -1,4 +1,4 @@
FROM git.zontreck.com/ariascreations/buildenvironments:arch
FROM git.zontreck.com/packages/arch:base
RUN pacman --noconfirm -S base-devel gcc nasm git curl wget make cmake automake autoconf archiso squashfs-tools file

15
DIND/Agent/Dockerfile Normal file
View file

@ -0,0 +1,15 @@
FROM git.zontreck.com/packages/dind:latest
ENV DOCKER_AGENT_SECRET NAN
ENV DOCKER_USER NAN
ENV DOCKER_PASSWORD NAN
ADD entrypoint.sh /
RUN chmod +x /entrypoint.sh
RUN apt-get install -y openjdk-17-jre
RUN mkdir /builder
ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]

10
DIND/Dockerfile Normal file
View file

@ -0,0 +1,10 @@
FROM git.zontreck.com/packages/debian:build
ENV HOME /root
RUN apt-get update && apt-get upgrade -y
RUN apt-get install -y docker-compose curl moreutils
USER root
ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]

11
DIND/Wings/Dockerfile Normal file
View file

@ -0,0 +1,11 @@
FROM git.zontreck.com/packages/dind:latest
RUN curl -L -o /usr/local/bin/wings "https://github.com/pelican-dev/wings/releases/latest/download/wings_linux_$([[ "$(uname -m)" == "x86_64" ]] && echo "amd64" || echo "arm64")"
RUN mkdir -pv /etc/pelican /var/run/wings
RUN chmod u+x /usr/local/bin/wings
ADD ./entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/bin/bash" "/entrypoint.sh"]

2
DIND/Wings/entrypoint.sh Normal file
View file

@ -0,0 +1,2 @@
#!/bin/bash
wings

View file

@ -1,19 +0,0 @@
FROM git.zontreck.com/ariascreations/buildenvironments:debianbuild
ENV DOCKER_AGENT_SECRET NAN
ENV DOCKER_USER NAN
ENV DOCKER_PASSWORD NAN
ENV HOME /root
RUN apt-get update && apt-get upgrade -y
RUN apt-get install -y openjdk-17-jdk docker-compose curl moreutils
ADD entrypoint.sh /
RUN chmod +x /entrypoint.sh
RUN mkdir /builder
USER root
ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]

View file

@ -1,4 +1,4 @@
FROM git.zontreck.com/ariascreations/buildenvironments:debian
FROM git.zontreck.com/packages/debian:base
ENV GRADLE_VERSION 8.12
RUN apt-get install -y build-essential && apt-get clean -y

View file

@ -1,11 +1,11 @@
FROM git.zontreck.com/ariascreations/buildenvironments:adk AS FLUTTER
FROM git.zontreck.com/packages/adk:latest AS FLUTTER
WORKDIR /
RUN curl -sO https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.29.0-stable.tar.xz
RUN tar -xf /flutter_linux_3.29.0-stable.tar.xz; rm /flutter*.xz
FROM git.zontreck.com/ariascreations/buildenvironments:adk
FROM git.zontreck.com/packages/adk:latest
WORKDIR /
ENV PATH $PATH:/flutter/bin

View file

@ -1,4 +1,4 @@
FROM git.zontreck.com/ariascreations/buildenvironments:debianbuild
FROM git.zontreck.com/packages/debian:build
RUN apt-get update
RUN apt-get upgrade -y

56
Jenkinsfile vendored
View file

@ -60,8 +60,8 @@ pipeline {
sh '''
#!/bin/bash
docker build -t git.zontreck.com/ariascreations/buildenvironments:debian DebianBase
docker push git.zontreck.com/ariascreations/buildenvironments:debian
docker build -t git.zontreck.com/packages/debian:base DebianBase
docker push git.zontreck.com/packages/debian:base
'''
}
}
@ -75,8 +75,8 @@ pipeline {
#!/bin/bash
docker build -t git.zontreck.com/ariascreations/buildenvironments:debianbuild DebianBuilder
docker push git.zontreck.com/ariascreations/buildenvironments:debianbuild
docker build -t git.zontreck.com/packages/debian:build DebianBuilder
docker push git.zontreck.com/packages/debian:build
'''
}
}
@ -88,8 +88,8 @@ pipeline {
sh '''
#!/bin/bash
docker build -t git.zontreck.com/ariascreations/buildenvironments:adk AndroidSDK
docker push git.zontreck.com/ariascreations/buildenvironments:adk
docker build -t git.zontreck.com/packages/adk:latest AndroidSDK
docker push git.zontreck.com/packages/adk:latest
'''
}
}
@ -101,8 +101,8 @@ pipeline {
sh '''
#!/bin/bash
docker build -t git.zontreck.com/ariascreations/buildenvironments:flutter FlutterSdk
docker push git.zontreck.com/ariascreations/buildenvironments:flutter
docker build -t git.zontreck.com/packages/flutter:latest FlutterSdk
docker push git.zontreck.com/packages/flutter:latest
'''
}
}
@ -114,8 +114,8 @@ pipeline {
sh '''
#!/bin/bash
docker build -t git.zontreck.com/ariascreations/buildenvironments:appimage AppImage
docker push git.zontreck.com/ariascreations/buildenvironments:appimage
docker build -t git.zontreck.com/packages/appimage:latest AppImage
docker push git.zontreck.com/packages/appimage:latest
'''
}
}
@ -127,8 +127,8 @@ pipeline {
sh '''
#!/bin/bash
docker build -t git.zontreck.com/ariascreations/buildenvironments:linux LinuxGeneralCompiler
docker push git.zontreck.com/ariascreations/buildenvironments:linux
docker build -t git.zontreck.com/packages/buildenvironments:linux LinuxGeneralCompiler
docker push git.zontreck.com/packages/buildenvironments:linux
'''
}
}
@ -140,8 +140,8 @@ pipeline {
sh '''
#!/bin/bash
docker build -t git.zontreck.com/ariascreations/buildenvironments:linuxfs FirestormLinux
docker push git.zontreck.com/ariascreations/buildenvironments:linuxfs
docker build -t git.zontreck.com/packages/buildenvironments:linuxfs FirestormLinux
docker push git.zontreck.com/packages/buildenvironments:linuxfs
'''
}
}
@ -153,8 +153,8 @@ pipeline {
sh '''
#!/bin/bash
docker build -t git.zontreck.com/ariascreations/buildenvironments:arch ArchBase
docker push git.zontreck.com/ariascreations/buildenvironments:arch
docker build -t git.zontreck.com/packages/arch:base ArchBase
docker push git.zontreck.com/packages/arch:base
'''
}
}
@ -166,21 +166,27 @@ pipeline {
sh '''
#!/bin/bash
docker build -t git.zontreck.com/ariascreations/buildenvironments:archdev ArchBuilder
docker push git.zontreck.com/ariascreations/buildenvironments:archdev
docker build -t git.zontreck.com/packages/arch:build ArchBuilder
docker push git.zontreck.com/packages/arch:build
'''
}
}
}
stage("Build DIND Image") {
stage("Build DIND Images") {
steps {
script {
sh '''
#!/bin/bash
docker build -t git.zontreck.com/ariascreations/buildenvironments:dindagent DINDAgent
docker push git.zontreck.com/ariascreations/buildenvironments:dindagent
docker build -t git.zontreck.com/packages/dind:latest DIND
docker push git.zontreck.com/packages/dind:latest
docker build -t git.zontreck.com/packages/buildenvironments:dind DIND/Agent
docker push git.zontreck.com/packages/buildenvironments:dind
docker build -t git.zontreck.com/packages/dind:wings DIND/Wings
docker push git.zontreck.com/packages/dind:wings
'''
}
}
@ -193,8 +199,8 @@ pipeline {
#!/bin/bash
docker build -t git.zontreck.com/ariascreations/buildenvironments:nextcloud NextCloud
docker push git.zontreck.com/ariascreations/buildenvironments:nextcloud
docker build -t git.zontreck.com/packages/nextcloud:latest NextCloud
docker push git.zontreck.com/packages/nextcloud:latest
'''
}
}
@ -207,8 +213,8 @@ pipeline {
#!/bin/bash
docker build -t git.zontreck.com/ariascreations/buildenvironments:jenkins Jenkins
docker push git.zontreck.com/ariascreations/buildenvironments:jenkins
docker build -t git.zontreck.com/packages/jenkins:latest Jenkins
docker push git.zontreck.com/packages/jenkins:latest
'''
}
}

View file

@ -1,4 +1,4 @@
FROM git.zontreck.com/ariascreations/buildenvironments:appimage AS BUILDER
FROM git.zontreck.com/packages/appimage:latest AS BUILDER
WORKDIR /
RUN wget https://cdn.vintagestory.at/gamefiles/stable/vs_server_linux-x64_1.20.4.tar.gz
@ -6,7 +6,7 @@ WORKDIR /vintagestory
RUN tar -xvf /vs_server_linux-x64_1.20.4.tar.gz && rm /*.tar.gz
FROM git.zontreck.com/ariascreations/buildenvironments:appimage
FROM git.zontreck.com/packages/appimage:latest
ENV PUB NAN
ENV AGENT NAN

View file

@ -1,4 +1,4 @@
FROM git.zontreck.com/ariascreations/buildenvironments:archdev
FROM git.zontreck.com/packages/arch:build
ADD fmodstudioapi20223linux.tar.gz /fmod.tar.gz

View file

@ -15,7 +15,7 @@ RUN git submodule update --init --recursive
RUN rm -rf .git
FROM git.zontreck.com/ariascreations/buildenvironments:debianbuild
FROM git.zontreck.com/packages/debian:build
RUN apt-get install -y apache2 apache2-utils php8.2 php8.2-gd php8.2-mysql php8.2-mbstring php8.2-xml php8.2-imagick imagemagick unzip zip php8.2-zip php8.2-curl php8.2-sqlite rsync

View file

@ -1,20 +1,19 @@
@echo off
docker build -t git.zontreck.com/packages/debian:base DebianBase
docker push git.zontreck.com/packages/debian:base
docker build -t git.zontreck.com/ariascreations/buildenvironments:debian DebianBase
docker push git.zontreck.com/ariascreations/buildenvironments:debian
docker build -t git.zontreck.com/packages/debian:build DebianBuilder
docker push git.zontreck.com/packages/debian:build
docker build -t git.zontreck.com/ariascreations/buildenvironments:debianbuild DebianBuilder
docker push git.zontreck.com/ariascreations/buildenvironments:debianbuild
docker build -t git.zontreck.com/packages/adk:latest AndroidSDK
docker push git.zontreck.com/packages/adk:latest
docker build -t git.zontreck.com/ariascreations/buildenvironments:adk AndroidSDK
docker push git.zontreck.com/ariascreations/buildenvironments:adk
docker build -t git.zontreck.com/packages/flutter:latest FlutterSdk
docker push git.zontreck.com/packages/flutter:latest
docker build -t git.zontreck.com/ariascreations/buildenvironments:flutter FlutterSdk
docker push git.zontreck.com/ariascreations/buildenvironments:flutter
docker build -t git.zontreck.com/ariascreations/buildenvironments:appimage AppImage
docker push git.zontreck.com/ariascreations/buildenvironments:appimage
docker build -t git.zontreck.com/packages/appimage:latest AppImage
docker push git.zontreck.com/packages/appimage:latest
docker build -t git.zontreck.com/ariascreations/buildenvironments:linuxfs FirestormLinux
docker push git.zontreck.com/ariascreations/buildenvironments:linuxfs
@ -23,21 +22,26 @@ docker build -t git.zontreck.com/ariascreations/buildenvironments:linux LinuxGen
docker push git.zontreck.com/ariascreations/buildenvironments:linux
docker build -t git.zontreck.com/ariascreations/buildenvironments:arch ArchBase
docker push git.zontreck.com/ariascreations/buildenvironments:arch
docker build -t git.zontreck.com/ariascreations/buildenvironments:archdev ArchBuilder
docker push git.zontreck.com/ariascreations/buildenvironments:archdev
docker build -t git.zontreck.com/ariascreations/buildenvironments:archmegapahit Megapahit/arch
docker push git.zontreck.com/ariascreations/buildenvironments:archmegapahit
docker build -t git.zontreck.com/packages/dind:latest DIND
docker push git.zontreck.com/packages/dind:latest
docker build -t git.zontreck.com/packages/buildenvironments:dind DIND/Agent
docker push git.zontreck.com/packages/buildenvironments:dind
docker build -t git.zontreck.com/packages/dind:wings DIND/Wings
docker push git.zontreck.com/packages/dind:wings
docker build -t git.zontreck.com/ariascreations/buildenvironments:dindagent DINDAgent
docker push git.zontreck.com/ariascreations/buildenvironments:dindagent
docker build -t git.zontreck.com/packages/nextcloud:latest NextCloud
docker push git.zontreck.com/packages/nextcloud:latest
docker build -t git.zontreck.com/ariascreations/buildenvironments:nextcloud NextCloud
docker push git.zontreck.com/ariascreations/buildenvironments:nextcloud
docker build -t git.zontreck.com/ariascreations/buildenvironments:jenkins Jenkins
docker push git.zontreck.com/ariascreations/buildenvironments:jenkins
docker build -t git.zontreck.com/packages/jenkins:latest Jenkins
docker push git.zontreck.com/packages/jenkins:latest

View file

@ -1,19 +1,19 @@
#!/bin/bash
docker build -t git.zontreck.com/ariascreations/buildenvironments:debian DebianBase
docker push git.zontreck.com/ariascreations/buildenvironments:debian
docker build -t git.zontreck.com/packages/debian:base DebianBase
docker push git.zontreck.com/packages/debian:base
docker build -t git.zontreck.com/ariascreations/buildenvironments:debianbuild DebianBuilder
docker push git.zontreck.com/ariascreations/buildenvironments:debianbuild
docker build -t git.zontreck.com/packages/debian:build DebianBuilder
docker push git.zontreck.com/packages/debian:build
docker build -t git.zontreck.com/ariascreations/buildenvironments:adk AndroidSDK
docker push git.zontreck.com/ariascreations/buildenvironments:adk
docker build -t git.zontreck.com/packages/adk:latest AndroidSDK
docker push git.zontreck.com/packages/adk:latest
docker build -t git.zontreck.com/ariascreations/buildenvironments:flutter FlutterSdk
docker push git.zontreck.com/ariascreations/buildenvironments:flutter
docker build -t git.zontreck.com/packages/flutter:latest FlutterSdk
docker push git.zontreck.com/packages/flutter:latest
docker build -t git.zontreck.com/ariascreations/buildenvironments:appimage AppImage
docker push git.zontreck.com/ariascreations/buildenvironments:appimage
docker build -t git.zontreck.com/packages/appimage:latest AppImage
docker push git.zontreck.com/packages/appimage:latest
docker build -t git.zontreck.com/ariascreations/buildenvironments:linuxfs FirestormLinux
docker push git.zontreck.com/ariascreations/buildenvironments:linuxfs
@ -29,15 +29,19 @@ docker push git.zontreck.com/ariascreations/buildenvironments:arch
docker build -t git.zontreck.com/ariascreations/buildenvironments:archdev ArchBuilder
docker push git.zontreck.com/ariascreations/buildenvironments:archdev
docker build -t git.zontreck.com/ariascreations/buildenvironments:archmegapahit Megapahit/arch
docker push git.zontreck.com/ariascreations/buildenvironments:archmegapahit
docker build -t git.zontreck.com/packages/dind:latest DIND
docker push git.zontreck.com/packages/dind:latest
docker build -t git.zontreck.com/packages/buildenvironments:dind DIND/Agent
docker push git.zontreck.com/packages/buildenvironments:dind
docker build -t git.zontreck.com/packages/dind:wings DIND/Wings
docker push git.zontreck.com/packages/dind:wings
docker build -t git.zontreck.com/ariascreations/buildenvironments:dindagent DINDAgent
docker push git.zontreck.com/ariascreations/buildenvironments:dindagent
docker build -t git.zontreck.com/packages/nextcloud:latest NextCloud
docker push git.zontreck.com/packages/nextcloud:latest
docker build -t git.zontreck.com/ariascreations/buildenvironments:nextcloud NextCloud
docker push git.zontreck.com/ariascreations/buildenvironments:nextcloud
docker build -t git.zontreck.com/ariascreations/buildenvironments:jenkins Jenkins
docker push git.zontreck.com/ariascreations/buildenvironments:jenkins
docker build -t git.zontreck.com/packages/jenkins:latest Jenkins
docker push git.zontreck.com/packages/jenkins:latest

View file

@ -9,7 +9,7 @@ services:
networks:
- buildenv
linuxfs:
image: git.zontreck.com/ariascreations/buildenvironments:linuxfs
image: git.zontreck.com/packages/buildenvironments:linuxfs
container_name: linuxfs
restart: unless-stopped
env_file: .env

View file

@ -1,18 +1,21 @@
#!/bin/bash
docker build -t git.zontreck.com/ariascreations/buildenvironments:debian DebianBase
docker build -t git.zontreck.com/ariascreations/buildenvironments:debianbuild DebianBuilder
docker build -t git.zontreck.com/ariascreations/buildenvironments:adk AndroidSDK
docker build -t git.zontreck.com/ariascreations/buildenvironments:flutter FlutterSdk
docker build -t git.zontreck.com/ariascreations/buildenvironments:appimage AppImage
docker build -t git.zontreck.com/packages/debian:base
docker build -t git.zontreck.com/packages/debian:build
docker build -t git.zontreck.com/packages/adk:latest AndroidSDK
docker build -t git.zontreck.com/packages/flutter:latest FlutterSdk
docker build -t git.zontreck.com/packages/appimage:latest AppImage
docker build -t git.zontreck.com/ariascreations/buildenvironments:linuxfs FirestormLinux
docker build -t git.zontreck.com/ariascreations/buildenvironments:linux LinuxGeneralCompiler
docker build -t git.zontreck.com/ariascreations/buildenvironments:arch ArchBase
docker build -t git.zontreck.com/ariascreations/buildenvironments:archdev ArchBuilder
docker build -t git.zontreck.com/ariascreations/buildenvironments:archmegapahit Megapahit/arch
docker build -t git.zontreck.com/packages/arch:base ArchBase
docker build -t git.zontreck.com/packages/arch:build ArchBuilder
docker build -t git.zontreck.com/ariascreations/buildenvironments:dindagent DINDAgent
docker build -t git.zontreck.com/ariascreations/buildenvironments:nextcloud NextCloud
docker build -t git.zontreck.com/ariascreations/buildenvironments:jenkins Jenkins
docker build -t git.zontreck.com/packages/dind:latest DIND
docker build -t git.zontreck.com/packages/buildenvironments:dind DIND/Agent
docker build -t git.zontreck.com/packages/dind:wings DIND/Wings
docker build -t git.zontreck.com/packages/nextcloud:latest NextCloud
docker build -t git.zontreck.com/packages/jenkins:latest Jenkins