Adjust docker files
This commit is contained in:
parent
7acd10c8d9
commit
9c1cc7d268
3 changed files with 3 additions and 32 deletions
|
@ -1,3 +1,3 @@
|
|||
#!/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"
|
||||
|
|
|
@ -5,24 +5,14 @@ services:
|
|||
image: git.zontreck.com/ariascreations/buildenvironments:linux
|
||||
container_name: linuxbuilder
|
||||
restart: unless-stopped
|
||||
env_file:
|
||||
- .env
|
||||
environment:
|
||||
- AGENT=${AGENT}
|
||||
- GRADLEPROP=${GRADLEPROP}
|
||||
- PUB=${PUB}
|
||||
- PRIVKEY=${PRIVKEY}
|
||||
- PUBKEY=${PUBKEY}
|
||||
env_file: .env
|
||||
networks:
|
||||
- buildenv
|
||||
linuxfs:
|
||||
image: git.zontreck.com/ariascreations/buildenvironments:linuxfs
|
||||
container_name: linuxfs
|
||||
restart: unless-stopped
|
||||
env_file:
|
||||
- .env
|
||||
environment:
|
||||
- AGENT=${FSAGENT}
|
||||
env_file: .env
|
||||
networks:
|
||||
- buildenv
|
||||
|
||||
|
|
19
run.sh
19
run.sh
|
@ -1,22 +1,3 @@
|
|||
#!/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
|
Loading…
Reference in a new issue