Add docker cli image

makinacorpus · Nov 29, 2024 · 984e417 · 984e417
1 parent 9a5749d
commit 984e417
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/.github/workflows/build-and-publish-ci-image.yml b/.github/workflows/build-and-publish-ci-image.yml
@@ -34,7 +34,7 @@ jobs:
       id: meta
       uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
       with:
-        images: simonmellerin/db-tools-bundle-ci
+        images: makinacorpus/db-tools-bundle-ci
 
     - name: Build and push Docker image
       uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671

diff --git a/.github/workflows/build-and-publish-franken-image.yml b/.github/workflows/build-and-publish-franken-image.yml
@@ -38,13 +38,13 @@ jobs:
       id: meta
       uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
       with:
-        images: simonmellerin/db-tools-bundle
+        images: makinacorpus/db-tools-bundle
 
     - name: Build and push Docker image
       uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
       with:
         context: .
         file: docker/franken-image/Dockerfile
         push: true
-        tags: ${{ steps.meta.outputs.tags == 'main' && 'latest' || steps.meta.outputs.tags }}
+        tags: ${{ steps.meta.outputs.tags == 'main' && 'unstable' || steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -24,7 +24,7 @@ jobs:
     name: "PHPUnit with PHP version matrix"
     runs-on: ubuntu-latest
     container:
-      image: simonmellerin/db-tools-bundle-ci:main
+      image: makinacorpus/db-tools-bundle-ci:main
 
     strategy:
       matrix:
@@ -89,7 +89,7 @@ jobs:
     name: "PHPUnit with PostgreSQL"
     runs-on: ubuntu-latest
     container:
-      image: simonmellerin/db-tools-bundle-ci:main
+      image: makinacorpus/db-tools-bundle-ci:main
     needs: "phpunit-smoke-tests"
 
     strategy:
@@ -152,7 +152,7 @@ jobs:
     name: "PHPUnit with MariaDB"
     runs-on: ubuntu-latest
     container:
-      image: simonmellerin/db-tools-bundle-ci:main
+      image: makinacorpus/db-tools-bundle-ci:main
     needs: "phpunit-smoke-tests"
 
     strategy:
@@ -218,7 +218,7 @@ jobs:
     name: "PHPUnit with MySQL"
     runs-on: ubuntu-latest
     container:
-      image: simonmellerin/db-tools-bundle-ci:main
+      image: makinacorpus/db-tools-bundle-ci:main
     needs: "phpunit-smoke-tests"
 
     strategy:
@@ -283,7 +283,7 @@ jobs:
   #   name: "PHPUnit with SQL Server"
   #   runs-on: ubuntu-latest
   #   container:
-  #     image: simonmellerin/db-tools-bundle-ci:main
+  #     image: makinacorpus/db-tools-bundle-ci:main
   #   needs: "phpunit-smoke-tests"
 
   #   strategy:
@@ -346,7 +346,7 @@ jobs:
     name: "PHPUnit with SQLite"
     runs-on: ubuntu-latest
     container:
-      image: simonmellerin/db-tools-bundle-ci:main
+      image: makinacorpus/db-tools-bundle-ci:main
     needs: "phpunit-smoke-tests"
 
     strategy:

diff --git a/docker/franken-image/Dockerfile b/docker/franken-image/Dockerfile
@@ -1,5 +1,6 @@
 FROM dunglas/frankenphp:1-php8.3
 ARG TAG=dev-main
+ARG EXTRA_COMPOSER_REQUIREMENTS=''
 
 # Basic requirements
 RUN apt-get update
@@ -33,6 +34,14 @@ COPY --from=composer /usr/bin/composer /usr/bin/composer
 
 WORKDIR /var/www
 
-RUN composer require makinacorpus/db-tools-bundle $TAG
+RUN composer require \
+    makinacorpus/db-tools-bundle:$TAG \
+    symfony/password-hasher:* \
+    # TODO uncomment these lines when those packages
+    # will have a compatible version available
+    # on packagist
+    # db-tools-bundle/pack-fr-fr:$TAG \
+    # db-tools-bundle/pack-faker:$TAG \
+    $EXTRA_COMPOSER_REQUIREMENTS
 
 ENTRYPOINT ["/var/www/vendor/bin/db-tools"]