From 7ce65dc804ad35399d2177aa1d7a77d04d86e5cc Mon Sep 17 00:00:00 2001 From: Marc Partensky Date: Sat, 25 Dec 2021 18:58:44 +0100 Subject: [PATCH 1/4] docker-compose and makefile --- Makefile | 4 ++++ docker-compose.yml | 10 ++++++++++ 2 files changed, 14 insertions(+) create mode 100644 Makefile create mode 100644 docker-compose.yml diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..1a760d81 --- /dev/null +++ b/Makefile @@ -0,0 +1,4 @@ +push: + docker-compose push discord-irc +build: + docker-compose -f docker-compose.yml up -d --build --remove-orphans diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..ff36bedc --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,10 @@ +version: "3.9" +services: + discord-irc: + image: marcpartensky/discord-irc + restart: unless-stopped + build: + context: . + dockerfile: ./Dockerfile + volumes: + - ./config:/config/config.json From a6a953110771bd33433889c6cf8d6c6d8867abb9 Mon Sep 17 00:00:00 2001 From: Marc Partensky Date: Sat, 25 Dec 2021 19:01:11 +0100 Subject: [PATCH 2/4] build before push --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1a760d81..591514cf 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -push: +push: build docker-compose push discord-irc build: docker-compose -f docker-compose.yml up -d --build --remove-orphans From ce71a7c7e55d9c990b37af1d1633716fe25cf3e1 Mon Sep 17 00:00:00 2001 From: Marc Partensky Date: Sat, 25 Dec 2021 19:10:10 +0100 Subject: [PATCH 3/4] docker-compose --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index ff36bedc..7faabad3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.9" services: discord-irc: - image: marcpartensky/discord-irc + image: discord-irc restart: unless-stopped build: context: . From e7330aa7b1f97723c8c9db0a155740069dec5d74 Mon Sep 17 00:00:00 2001 From: Marc Partensky Date: Sat, 25 Dec 2021 19:11:37 +0100 Subject: [PATCH 4/4] no push statement --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index 591514cf..be3c59a8 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,2 @@ -push: build - docker-compose push discord-irc build: docker-compose -f docker-compose.yml up -d --build --remove-orphans