diff --git a/FirestormLinux/entrypoint.sh b/FirestormLinux/entrypoint.sh index 82aa1b6..7f701f1 100644 --- a/FirestormLinux/entrypoint.sh +++ b/FirestormLinux/entrypoint.sh @@ -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" diff --git a/docker-compose.yml b/docker-compose.yml index ee0d7dc..a4f42f5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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 diff --git a/run.sh b/run.sh index 8193907..80b5727 100644 --- a/run.sh +++ b/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 \ No newline at end of file