fix: wip

.github/workflows/workflow.build.yaml

@@ -98,8 +98,5 @@ jobs:
     steps:
       - uses: "actions/checkout@v3"
       - run: yarn --immutable
-      - run: |
-          if [ -d tests ]; then
-            $(yarn workspace root bin bats) tests/*
-          fi
-        working-directory: ${{ inputs.name }}
+      - run: yarn workspace ${{ inputs.name }} build
+      - run: yarn workspace ${{ inputs.name }} test

.yarnrc.yml

@@ -1,3 +1,7 @@
 nodeLinker: node-modules
 
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
+    spec: "@yarnpkg/plugin-workspace-tools"
+
 yarnPath: .yarn/releases/yarn-3.5.1.cjs

CONTRIBUTING.md

@@ -4,21 +4,41 @@
 
 We use nodejs tools to help developing, testing the images.
 
+### install
+
+```sh
+yarn
+```
+
+### build
+
+#### one image
 ```sh
-# Install all with
-$ yarn
+yarn workspace <package> build
 ```
 
-**NOTE**: You might need to manualy install `dhall` and `postgres-client` on your computeur for now...
+#### all images
+```sh
+yarn build
+```
+
+### test
+
+you must build image before running tests on it
 
-We use `Makefile` to orchestrator the monorepo.
+#### one image
 
 ```sh
-$ cd <package>
-$ make
-# Will deal with one package build and tests
+yarn workspace <package> test
 ```
 
+#### all images
+
+```sh
+yarn workspace test
+```
+
+
 ## Create a new image
 
 1. Create a folder with the image name (example: foo)
@@ -32,21 +52,8 @@ $ mkdir foo
    You can follow the [`wait-for-postgres/README.md` as model](./wait-for-postgres/README.md).
 1. Add the image to the table in the [root `README.md`](./README.md).  
    Keep alpha sorted plz ;)
-1. Add a `Makefile` to specify how to make the image  
-   You can follow the [`wait-for-postgres/Makefile` as model](./wait-for-postgres/Makefile).
-1. Add a `Makefile` to specify how to make the image  
-   You can follow the [`wait-for-postgres/Makefile` as model](./wait-for-postgres/Makefile).
-1. Add a `docker-compose.yml` with a `.env` handle docker configurations  
-   We name the service with the distro used as from for the image  
-   You can follow the [`wait-for-postgres/docker-compose.yml` as model](./wait-for-postgres/docker-compose.yml) and[`wait-for-postgres/.env` as model](./wait-for-postgres/.env).  
-   Note that there is an additional service `postgres` used for tests here
-1. Add [container structure test](https://github.com/GoogleContainerTools/container-structure-test/)  
-   We ensure that the built image is well made :)  
-   You can follow the [`wait-for-postgres/tests/container-structure-test.yml` as model](./wait-for-postgres/tests/container-structure-test.yml)
 1. Add [bats](https://github.com/bats-core/bats-core) integration test  
    Additional config and binaries can be tested with bats files in the `tests` folder  
-   You can follow the [`wait-for-postgres/docker-compose.yml` as model](./wait-for-postgres/docker-compose.yml) and[`wait-for-postgres/.env` as model](./wait-for-postgres/.env).  
-   Note that there is an additional service `postgres` used for tests here
 
 ## Test
 
@@ -57,10 +64,3 @@ $ docker run --rm -i ghcr.io/hadolint/hadolint < ./<image>/Dockerfile
 # example
 $ docker run --rm -i ghcr.io/hadolint/hadolint < ./helm/Dockerfile
 ```
-
-## Generate GitHub Workflow
-
-## Release policy
-
-We mainly use [semantic-release](https://github.com/semantic-release/semantic-release) to generate our release
-You need an [Github token](https://github.com/settings/tokens/new) to release.

README.md

@@ -30,6 +30,8 @@ $ docker pull ghcr.io/socialgouv/docker/<image>
 | --------------------- | --------------------------------------------------------------- | ------------------------------------------------------------------------------------------ |
 | **bats**              | `docker pull ghcr.io/socialgouv/docker/bats`                    | [![README](https://img.shields.io/badge/README--green.svg)](./bats/README.md)              |
 | **cnpg-pgvector**     | `docker pull ghcr.io/socialgouv/docker/cnpg-pgvector`           | [![README](https://img.shields.io/badge/README--green.svg)](./cnpg-pgvector/README.md)     |
+| **datasette**         | `docker pull ghcr.io/socialgouv/docker/datasette`               | [![README](https://img.shields.io/badge/README--green.svg)](./datasette/README.md)     |
+| **git**               | `docker pull ghcr.io/socialgouv/docker/git`                     | [![README](https://img.shields.io/badge/README--green.svg)](./git/README.md)     |
 | **nginx**             | `docker pull ghcr.io/socialgouv/docker/nginx`                   | [![README](https://img.shields.io/badge/README--green.svg)](./nginx/README.md)             |
 | **nginx4spa**         | `docker pull ghcr.io/socialgouv/docker/nginx4spa`               | [![README](https://img.shields.io/badge/README--green.svg)](./nginx4spa/README.md)         |
 | **psql**              | `docker pull ghcr.io/socialgouv/docker/psql`                    | [![README](https://img.shields.io/badge/README--green.svg)](./psql/README.md)              |

bats/package.json

@@ -2,5 +2,9 @@
   "version": "7.6.2-alpha.18",
   "name": "bats",
   "packageManager": "yarn@3.5.1",
+  "scripts": {
+    "build": "docker build -t socialgouv_docker_bats .",
+    "test": "$(yarn bin:bats) tests/*"
+  },
   "private": true
 }

cnpg-pgvector/package.json

@@ -2,5 +2,9 @@
   "version": "7.6.2-alpha.17",
   "name": "cnpg-pgvector",
   "packageManager": "yarn@3.5.1",
+  "scripts": {
+    "build": "docker build -t socialgouv_docker_cnpg-pgvector .",
+    "test": "echo no tests to run"
+  },
   "private": true
 }

datasette/README.md

@@ -0,0 +1 @@
+# Datasette

datasette/package.json

@@ -2,5 +2,9 @@
   "version": "7.6.2-alpha.16",
   "name": "datasette",
   "packageManager": "yarn@3.5.1",
+  "scripts": {
+    "build": "docker build -t socialgouv_docker_datasette .",
+    "test": "echo no tests to run"
+  },
   "private": true
 }

git/README.md

@@ -0,0 +1 @@
+# Git

git/package.json

@@ -2,5 +2,9 @@
   "version": "7.6.2-alpha.16",
   "name": "git",
   "packageManager": "yarn@3.5.1",
+  "scripts": {
+    "build": "docker build -t socialgouv_docker_git .",
+    "test": "echo no tests to run"
+  },
   "private": true
 }

nginx/package.json

@@ -2,5 +2,9 @@
   "version": "7.6.2-alpha.17",
   "name": "nginx",
   "packageManager": "yarn@3.5.1",
+  "scripts": {
+    "build": "docker build -t socialgouv_docker_nginx .",
+    "test": "$(yarn bin:bats) tests/*"
+  },
   "private": true
 }

nginx/tests/404.bats

@@ -3,16 +3,17 @@
 load '../../.bats/common.bats.bash'
 
 setup_file() {
-  docker-compose run \
+  docker run \
     --detach \
     --publish 8888:8080 \
     --rm \
     --volume ${BATS_TEST_DIRNAME}/fixtures:/usr/share/nginx/html \
-    alpine
+    --name socialgouv_docker_nginx \
+    socialgouv_docker_nginx
 }
 
 teardown_file() {
-  docker-compose rm -sf
+  docker rm -f socialgouv_docker_nginx
 }
 
 @test "nginx: should return status 404 (not a SPA)" {

nginx/tests/basic.bats

@@ -3,11 +3,11 @@
 load '../../.bats/common.bats.bash'
 
 setup_file() {
-  docker-compose up -d alpine
+  docker run --rm -d -p 8888:8080 --name socialgouv_docker_nginx socialgouv_docker_nginx
 }
 
 teardown_file() {
-  docker-compose stop
+  docker rm -f socialgouv_docker_nginx
 }
 
 @test "nginx: basic nginx should return 'Welcome to nginx!'" {

nginx/tests/default-404-2.bats

@@ -3,16 +3,17 @@
 load '../../.bats/common.bats.bash'
 
 setup_file() {
-  docker-compose run \
+  docker run \
     --detach \
     --publish 8888:8080 \
     --rm \
     --volume ${BATS_TEST_DIRNAME}/fixtures-404:/usr/share/nginx/html \
-    alpine
+    --name socialgouv_docker_nginx \
+    socialgouv_docker_nginx
 }
 
 teardown_file() {
-  docker-compose rm -sf
+  docker rm -f socialgouv_docker_nginx
 }
 
 @test "nginx: should return 404 page for next.js exports (not a SPA)" {

nginx/tests/default-404.bats

@@ -3,16 +3,17 @@
 load '../../.bats/common.bats.bash'
 
 setup_file() {
-  docker-compose run \
+  docker run \
     --detach \
     --publish 8888:8080 \
     --rm \
     --volume ${BATS_TEST_DIRNAME}/fixtures-simple:/usr/share/nginx/html \
-    alpine
+    --name socialgouv_docker_nginx \
+    socialgouv_docker_nginx
 }
 
 teardown_file() {
-  docker-compose rm -sf
+  docker rm -f socialgouv_docker_nginx
 }
 
 @test "nginx: should return default SocialGouv 404 page (not a SPA)" {

nginx/tests/volume.bats

@@ -3,16 +3,17 @@
 load '../../.bats/common.bats.bash'
 
 setup_file() {
-  docker-compose run \
+  docker run \
     --detach \
     --publish 8888:8080 \
     --rm \
     --volume ${BATS_TEST_DIRNAME}/fixtures:/usr/share/nginx/html \
-    alpine
+    --name socialgouv_docker_nginx \
+    socialgouv_docker_nginx
 }
 
 teardown_file() {
-  docker-compose rm -sf
+  docker rm -f socialgouv_docker_nginx
 }
 
 @test "nginx: with --volume should return 'nginx'" {

nginx4spa/package.json

@@ -2,5 +2,9 @@
   "version": "7.6.2-alpha.17",
   "name": "nginx4spa",
   "packageManager": "yarn@3.5.1",
+  "scripts": {
+    "build": "docker build -t socialgouv_docker_nginx4spa .",
+    "test": "$(yarn bin:bats) tests/*"
+  },
   "private": true
 }

nginx4spa/pouet

@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Welcome to nginx!</title>
+<style>
+html { color-scheme: light dark; }
+body { width: 35em; margin: 0 auto;
+font-family: Tahoma, Verdana, Arial, sans-serif; }
+</style>
+</head>
+<body>
+<h1>Welcome to nginx!</h1>
+<p>If you see this page, the nginx web server is successfully installed and
+working. Further configuration is required.</p>
+
+<p>For online documentation and support please refer to
+<a href="http://nginx.org/">nginx.org</a>.<br/>
+Commercial support is available at
+<a href="http://nginx.com/">nginx.com</a>.</p>
+
+<p><em>Thank you for using nginx.</em></p>
+</body>
+</html>

nginx4spa/pouet.1

@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Welcome to nginx!</title>
+<style>
+html { color-scheme: light dark; }
+body { width: 35em; margin: 0 auto;
+font-family: Tahoma, Verdana, Arial, sans-serif; }
+</style>
+</head>
+<body>
+<h1>Welcome to nginx!</h1>
+<p>If you see this page, the nginx web server is successfully installed and
+working. Further configuration is required.</p>
+
+<p>For online documentation and support please refer to
+<a href="http://nginx.org/">nginx.org</a>.<br/>
+Commercial support is available at
+<a href="http://nginx.com/">nginx.com</a>.</p>
+
+<p><em>Thank you for using nginx.</em></p>
+</body>
+</html>

nginx4spa/tests/404.bats

@@ -3,11 +3,11 @@
 load '../../.bats/common.bats.bash'
 
 setup_file() {
-  docker-compose up -d alpine
+  docker run --rm -p 8888:8080 -d --name socialgouv_docker_nginx4spa socialgouv_docker_nginx4spa
 }
 
 teardown_file() {
-  docker-compose down
+  docker rm -f socialgouv_docker_nginx4spa
 }
 
 @test "nginx4spa: should return 200 and homepage on 404 (SPA client-side routing)" {

nginx4spa/tests/basic.bats

@@ -3,11 +3,11 @@
 load '../../.bats/common.bats.bash'
 
 setup_file() {
-  docker-compose up -d alpine
+  docker run -p 8888:8080 -d --rm --name socialgouv_docker_nginx4spa socialgouv_docker_nginx4spa
 }
 
 teardown_file() {
-  docker-compose stop
+  docker rm -f socialgouv_docker_nginx4spa
 }
 
 @test "nginx4spa: basic nginx should return 'Welcome to nginx!'" {

nginx4spa/tests/volume.bats

@@ -3,16 +3,17 @@
 load '../../.bats/common.bats.bash'
 
 setup_file() {
-  docker-compose run \
+  docker run \
     --detach \
     --publish 8888:8080 \
     --rm \
     --volume ${BATS_TEST_DIRNAME}/fixtures:/usr/share/nginx/html \
-    alpine
+    --name socialgouv_docker_nginx4spa \
+    socialgouv_docker_nginx4spa
 }
 
 teardown_file() {
-  docker-compose rm -sf
+  docker rm -f socialgouv_docker_nginx4spa
 }
 
 @test "nginx4spa: with --volume should return 'nginx'" {

package.json

@@ -9,7 +9,10 @@
     "lerna": "^6.6.2"
   },
   "scripts": {
-    "postversion": "./scripts/push-tags-one-by-one.sh"
+    "postversion": "./scripts/push-tags-one-by-one.sh",
+    "bin:bats": "yarn bin bats",
+    "build": "yarn workspaces foreach run build",
+    "test": "yarn workspaces foreach run test"
   },
   "workspaces": [
     "bats",

psql/package.json

@@ -2,5 +2,9 @@
   "version": "7.6.2-alpha.17",
   "name": "psql",
   "packageManager": "yarn@3.5.1",
+  "scripts": {
+    "build": "docker build -t socialgouv_docker_psql .",
+    "test": "$(yarn bin:bats) tests/*"
+  },
   "private": true
 }