From 45da665ce0666db28c4d7f0a693c8b8614d92fa3 Mon Sep 17 00:00:00 2001 From: smf Date: Fri, 8 Mar 2024 21:26:54 +0800 Subject: [PATCH 1/2] change base image --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8e8ffdb..6d0670e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,7 @@ -FROM alpinelinux/docker-compose +# FROM alpinelinux/docker-compose +FROM docker +COPY --from=docker/compose-bin:edge /docker-compose /usr/libexec/docker/cli-plugins/docker-compose +RUN docker compose version LABEL 'name'='Docker Deployment Action' LABEL 'com.github.actions.name'='Docker Deployment' From 5e5c5eeda2a0da70ce86a7142a252ef900206927 Mon Sep 17 00:00:00 2001 From: smf Date: Fri, 8 Mar 2024 21:46:42 +0800 Subject: [PATCH 2/2] info --- Dockerfile | 7 +++---- docker-entrypoint.sh | 3 +++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6d0670e..a7136d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,10 @@ -# FROM alpinelinux/docker-compose FROM docker COPY --from=docker/compose-bin:edge /docker-compose /usr/libexec/docker/cli-plugins/docker-compose RUN docker compose version -LABEL 'name'='Docker Deployment Action' -LABEL 'com.github.actions.name'='Docker Deployment' -LABEL 'com.github.actions.description'='supports docker-compose and Docker Swarm deployments' +LABEL 'name'='Docker Compose Remote Deployment Action' +LABEL 'com.github.actions.name'='Docker Compose Remote Deployment' +LABEL 'com.github.actions.description'='supports docker-compose remotely through ssh.' LABEL 'com.github.actions.icon'='send' LABEL 'com.github.actions.color'='green' diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 5da245f..1ca7472 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -65,6 +65,9 @@ fi echo >> ~/.ssh/config chmod 600 ~/.ssh/config +docker -v +docker compose version + set context echo "Create docker context" docker context create remote --docker "host=ssh://REMOTE_DOCKER_HOST"