Adjust docker files

This commit is contained in:
zontreck 2024-09-13 13:30:07 -07:00
parent 7acd10c8d9
commit 9c1cc7d268
3 changed files with 3 additions and 32 deletions

View file

@ -1,3 +1,3 @@
#!/bin/bash #!/bin/bash
java -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -jar /agent.jar -url "https://ci.zontreck.com" -secret "$AGENT" -name "Linux" -workDir "/builder" java -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -jar /agent.jar -url "https://ci.zontreck.com" -secret "$FSAGENT" -name "Linux" -workDir "/builder"

View file

@ -5,24 +5,14 @@ services:
image: git.zontreck.com/ariascreations/buildenvironments:linux image: git.zontreck.com/ariascreations/buildenvironments:linux
container_name: linuxbuilder container_name: linuxbuilder
restart: unless-stopped restart: unless-stopped
env_file: env_file: .env
- .env
environment:
- AGENT=${AGENT}
- GRADLEPROP=${GRADLEPROP}
- PUB=${PUB}
- PRIVKEY=${PRIVKEY}
- PUBKEY=${PUBKEY}
networks: networks:
- buildenv - buildenv
linuxfs: linuxfs:
image: git.zontreck.com/ariascreations/buildenvironments:linuxfs image: git.zontreck.com/ariascreations/buildenvironments:linuxfs
container_name: linuxfs container_name: linuxfs
restart: unless-stopped restart: unless-stopped
env_file: env_file: .env
- .env
environment:
- AGENT=${FSAGENT}
networks: networks:
- buildenv - buildenv

19
run.sh
View file

@ -1,22 +1,3 @@
#!/bin/bash #!/bin/bash
echo -ne "AGENT=" > .env
cat "$AGENT" >> .env
echo -ne "\nGRADLEPROP=" >> .env
cat "$GRADLEPROP" | base64 >> .env
echo -ne "\nPUB" >> .env
cat "$PUB" >> .env
echo -ne "\nPRIVKEY=" >> .env
cat "$PRIVKEY" | base64 >> .env
echo -ne "\nPUBKEY=" >> .env
cat "$PUBKEY" | base64 >> .env
echo -ne"\nFSAGENT=" >> .env
cat "$FSAGENT" >> .env
docker-compose up -d docker-compose up -d