From 0d127aa52fac4ba3155242d77effff1c8ed62d4c Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Wed, 27 Mar 2024 21:52:16 -0400 Subject: [PATCH 1/3] Add some versioning stuff to docs --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7d5d695..e9bad0f 100644 --- a/README.md +++ b/README.md @@ -11,10 +11,12 @@ To do a build/push to our container registry, first create a token at https://gi Then, run: ``` -docker build -t git.agaric.com/agaric/deploycontainer:latest . +# finish commits and testing +git tag "0.0.X" +docker build -t git.agaric.com/agaric/deploycontainer:0.0.X +docker tag git.agaric.com/agaric/deploycontainer:0.0.X git.agaric.com/agaric/deploycontainer:latest docker push git.agaric.com/agaric/deploycontainer:latest ``` - -No, this is not best practice - the latest should only point to latest, and there should be a semver in use. +Need to verify pushing latest also includes the version...not sure If you need a token for git access to git.drupalcode.org, go to https://git.drupalcode.org/-/user_settings/personal_access_tokens and grant the token api_read access. The token can be tested (i.e. inside a deploycontainer - `docker run -v .:/home/deployer -it agaric/deploycontainer:latest`) with `composer config -g gitlab-token.git.drupalcode.org {your token}` and then running composer install. From ff1ffcbed023707cf91867e9136e745084c3944d Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Tue, 7 Oct 2025 22:19:31 -0400 Subject: [PATCH 2/3] Update php, node, composer --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2785209..b71ce51 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -FROM php:8.1 +FROM php:8.3 -ARG NODE_VER=20.11.1 +ARG NODE_VER=20.19.5 SHELL ["/bin/bash", "-c"] RUN curl https://nodejs.org/dist/v$NODE_VER/node-v$NODE_VER-linux-x64.tar.xz | tar --file=- --extract --xz --directory /usr/local/ --strip-components=1 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" -RUN php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" +RUN php -r "if (hash_file('sha384', 'composer-setup.php') === 'ed0feb545ba87161262f2d45a633e34f591ebb3381f2e0063c345ebea4d228dd0043083717770234ec00c5a9f9593792') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" RUN php composer-setup.php RUN php -r "unlink('composer-setup.php');" RUN mv composer.phar /usr/local/bin/composer From 42b2ec65b9fe75fcc364d482c8af1b7dadd01456 Mon Sep 17 00:00:00 2001 From: "Chris (wolcen) Thompson" Date: Tue, 7 Oct 2025 22:19:45 -0400 Subject: [PATCH 3/3] Improve (ahem, correct) documentation --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e9bad0f..1f62c0b 100644 --- a/README.md +++ b/README.md @@ -12,9 +12,10 @@ To do a build/push to our container registry, first create a token at https://gi Then, run: ``` # finish commits and testing -git tag "0.0.X" -docker build -t git.agaric.com/agaric/deploycontainer:0.0.X -docker tag git.agaric.com/agaric/deploycontainer:0.0.X git.agaric.com/agaric/deploycontainer:latest +export TAG="0.0.X" +git tag "${TAG}" +docker build -t git.agaric.com/agaric/deploycontainer:${TAG} . +docker tag git.agaric.com/agaric/deploycontainer:${TAG} git.agaric.com/agaric/deploycontainer:latest docker push git.agaric.com/agaric/deploycontainer:latest ``` Need to verify pushing latest also includes the version...not sure