From 5966489e4eb29543be6d6a77e00b13bc73c54a37 Mon Sep 17 00:00:00 2001 From: Alexis Lefebvre Date: Wed, 20 Dec 2023 19:30:40 +0100 Subject: [PATCH 1/2] Revert "fix: swap docker and docker-compose" This reverts commit 44a9748bf9283cb83eadb9bea25df5aafb1a7083. --- docker-compose/Dockerfile | 2 +- docker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose/Dockerfile b/docker-compose/Dockerfile index 9537997..9f39315 100644 --- a/docker-compose/Dockerfile +++ b/docker-compose/Dockerfile @@ -1 +1 @@ -FROM docker-compose:latest +FROM docker:latest diff --git a/docker/Dockerfile b/docker/Dockerfile index 9f39315..a0c8e6b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1 +1 @@ -FROM docker:latest +FROM docker/compose:latest From 5da9c02f8a45123cf6b72f32dc112173c8360a15 Mon Sep 17 00:00:00 2001 From: Alexis Lefebvre Date: Wed, 20 Dec 2023 19:31:00 +0100 Subject: [PATCH 2/2] Revert "feat: add docker and docker-compose" This reverts commit 2ded997953400a0e5e893691dcb70766b0389dde. --- .github/workflows/push.yaml | 2 -- README.md | 2 -- docker-compose/Dockerfile | 1 - docker/Dockerfile | 1 - 4 files changed, 6 deletions(-) delete mode 100644 docker-compose/Dockerfile delete mode 100644 docker/Dockerfile diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 6bc562f..94c7f95 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -18,8 +18,6 @@ jobs: matrix: image: - cypress-16-docker-compose - - docker - - docker-compose - node-12-eas - node-14-eas - node-16-curl-tidy diff --git a/README.md b/README.md index fc1710c..dffc32e 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,6 @@ Images: - `ghcr.io/troopers/cypress-16-docker-compose`: use it to run Cypress and a Docker stack -- `ghcr.io/troopers/docker`: use it to run Docker -- `ghcr.io/troopers/docker-compose`: use it to run Docker In Docker - `ghcr.io/troopers/node-12-eas`: use it to run Expo EAS - `ghcr.io/troopers/node-14-eas`: use it to run Expo EAS with Expo and SDK 45 - `ghcr.io/troopers/node-16-curl-tidy`: use it to run node and tidy diff --git a/docker-compose/Dockerfile b/docker-compose/Dockerfile deleted file mode 100644 index 9f39315..0000000 --- a/docker-compose/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -FROM docker:latest diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index a0c8e6b..0000000 --- a/docker/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -FROM docker/compose:latest