From 36cf4445883780a4c2a32567babd45845f0241bc Mon Sep 17 00:00:00 2001 From: stam Date: Wed, 2 Jun 2021 02:37:37 +0300 Subject: [PATCH] teamcity migrated to new format --- linux/teamcity/agent/Makefile | 9 +++++---- linux/teamcity/agent/docker-compose.yml | 6 ++++++ linux/teamcity/server/Makefile | 9 +++++---- linux/teamcity/server/docker-compose.yml | 6 ++++++ 4 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 linux/teamcity/agent/docker-compose.yml create mode 100644 linux/teamcity/server/docker-compose.yml diff --git a/linux/teamcity/agent/Makefile b/linux/teamcity/agent/Makefile index a1e173ea9..82c5a2de6 100644 --- a/linux/teamcity/agent/Makefile +++ b/linux/teamcity/agent/Makefile @@ -1,4 +1,5 @@ -all: tca -tca: - docker build --compress -t epicmorg/teamcity-agent:latest . - docker push epicmorg/teamcity-agent:latest +all: app + +app: + docker-compose build --compress + docker-compose push diff --git a/linux/teamcity/agent/docker-compose.yml b/linux/teamcity/agent/docker-compose.yml new file mode 100644 index 000000000..9190c2827 --- /dev/null +++ b/linux/teamcity/agent/docker-compose.yml @@ -0,0 +1,6 @@ +version: '3.9' +services: + app: + image: "epicmorg/teamcity-agent:latest" + build: + context: . diff --git a/linux/teamcity/server/Makefile b/linux/teamcity/server/Makefile index ef347f552..82c5a2de6 100644 --- a/linux/teamcity/server/Makefile +++ b/linux/teamcity/server/Makefile @@ -1,4 +1,5 @@ -all: tcs -tcs: - docker build --compress -t epicmorg/teamcity-server:latest . - docker push epicmorg/teamcity-server:latest +all: app + +app: + docker-compose build --compress + docker-compose push diff --git a/linux/teamcity/server/docker-compose.yml b/linux/teamcity/server/docker-compose.yml new file mode 100644 index 000000000..ca5f2ec95 --- /dev/null +++ b/linux/teamcity/server/docker-compose.yml @@ -0,0 +1,6 @@ +version: '3.9' +services: + app: + image: "epicmorg/teamcity-server:latest" + build: + context: .