From 82f35a1673ab8cf98c5557195e574566f293abea Mon Sep 17 00:00:00 2001 From: Kevin Bolduc Date: Mon, 12 Sep 2022 13:55:33 -0400 Subject: [PATCH] Updating Ruby 2.7 (2.7.6) Dockerfile with Yarn 1.22.19 - Adding the new benefitsbydesign/ruby-node-yarn docker repo to the readme instructions --- 2.7-10/buster/Dockerfile | 2 +- 2.7-11/buster/Dockerfile | 2 +- 2.7-12/buster/Dockerfile | 2 +- 2.7-13/buster/Dockerfile | 2 +- 2.7-14/buster/Dockerfile | 2 +- 2.7-15/buster/Dockerfile | 2 +- 2.7-16/buster/Dockerfile | 2 +- 2.7-8/buster/Dockerfile | 2 +- 2.7-9/buster/Dockerfile | 2 +- README.md | 22 +++++++++++++--------- 10 files changed, 22 insertions(+), 18 deletions(-) diff --git a/2.7-10/buster/Dockerfile b/2.7-10/buster/Dockerfile index bb40dac..c21a94b 100644 --- a/2.7-10/buster/Dockerfile +++ b/2.7-10/buster/Dockerfile @@ -46,7 +46,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && npm --version -ENV YARN_VERSION=1.22.5 +ENV YARN_VERSION=1.22.19 RUN set -ex \ && for key in \ diff --git a/2.7-11/buster/Dockerfile b/2.7-11/buster/Dockerfile index 898114c..040aec4 100644 --- a/2.7-11/buster/Dockerfile +++ b/2.7-11/buster/Dockerfile @@ -46,7 +46,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && npm --version -ENV YARN_VERSION=1.22.5 +ENV YARN_VERSION=1.22.19 RUN set -ex \ && for key in \ diff --git a/2.7-12/buster/Dockerfile b/2.7-12/buster/Dockerfile index 04f71f1..6828cfa 100644 --- a/2.7-12/buster/Dockerfile +++ b/2.7-12/buster/Dockerfile @@ -46,7 +46,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && npm --version -ENV YARN_VERSION=1.22.5 +ENV YARN_VERSION=1.22.19 RUN set -ex \ && for key in \ diff --git a/2.7-13/buster/Dockerfile b/2.7-13/buster/Dockerfile index 3b25009..5461c6a 100644 --- a/2.7-13/buster/Dockerfile +++ b/2.7-13/buster/Dockerfile @@ -46,7 +46,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && npm --version -ENV YARN_VERSION=1.22.5 +ENV YARN_VERSION=1.22.19 RUN set -ex \ && for key in \ diff --git a/2.7-14/buster/Dockerfile b/2.7-14/buster/Dockerfile index e7f3176..24e8806 100644 --- a/2.7-14/buster/Dockerfile +++ b/2.7-14/buster/Dockerfile @@ -48,7 +48,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && npm --version -ENV YARN_VERSION=1.22.5 +ENV YARN_VERSION=1.22.19 RUN set -ex \ && for key in \ diff --git a/2.7-15/buster/Dockerfile b/2.7-15/buster/Dockerfile index c474bda..43f6bb1 100644 --- a/2.7-15/buster/Dockerfile +++ b/2.7-15/buster/Dockerfile @@ -45,7 +45,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && npm --version -ENV YARN_VERSION=1.22.5 +ENV YARN_VERSION=1.22.19 RUN set -ex \ && for key in \ diff --git a/2.7-16/buster/Dockerfile b/2.7-16/buster/Dockerfile index ec4d911..dd8e94e 100644 --- a/2.7-16/buster/Dockerfile +++ b/2.7-16/buster/Dockerfile @@ -48,7 +48,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && npm --version -ENV YARN_VERSION=1.22.5 +ENV YARN_VERSION=1.22.19 RUN set -ex \ && for key in \ diff --git a/2.7-8/buster/Dockerfile b/2.7-8/buster/Dockerfile index 17908aa..7978329 100644 --- a/2.7-8/buster/Dockerfile +++ b/2.7-8/buster/Dockerfile @@ -46,7 +46,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && npm --version -ENV YARN_VERSION=1.22.5 +ENV YARN_VERSION=1.22.19 RUN set -ex \ && for key in \ diff --git a/2.7-9/buster/Dockerfile b/2.7-9/buster/Dockerfile index 0174dec..3718079 100644 --- a/2.7-9/buster/Dockerfile +++ b/2.7-9/buster/Dockerfile @@ -47,7 +47,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \ && npm --version -ENV YARN_VERSION=1.22.5 +ENV YARN_VERSION=1.22.19 RUN set -ex \ && for key in \ diff --git a/README.md b/README.md index f76636b..6221fe3 100644 --- a/README.md +++ b/README.md @@ -31,12 +31,12 @@ There will be multiple variants of the tag versions to assist with selecting a s The Ruby, Node, and Yarn dependencies will be separated by a `-` and will be used in the following order: `RUBY-NODE-YARN` -An example of using Ruby `2.7.6`, with Node `16.17.0` and Yarn `1.22.5` would be: `2.7.6-16.17.0-1.22.5` +An example of using Ruby `2.7.6`, with Node `16.17.0` and Yarn `1.22.19` would be: `2.7.6-16.17.0-1.22.19` ## Supported tags and respective `Dockerfile` links -- [`2.7.6-16.17.0-1.22.5`, `latest`](https://github.com/BBD-Development/docker-ruby-node-yarn/blob/master/2.7-16/buster/Dockerfile) -- [`2.7.6-14.20.0-1.22.5`](https://github.com/BBD-Development/docker-ruby-node-yarn/blob/master/2.7-14/buster/Dockerfile) +- [`2.7.6-16.17.0-1.22.4`,`2.7.6-16.17.0-1.22.5`,`2.7.6-16.17.0-1.22.19`, `latest`](https://github.com/BBD-Development/docker-ruby-node-yarn/blob/master/2.7-16/buster/Dockerfile) +- [`2.7.6-14.20.0-1.22.4`,`2.7.6-14.20.0-1.22.5`,`2.7.6-14.20.0-1.22.19`](https://github.com/BBD-Development/docker-ruby-node-yarn/blob/master/2.7-14/buster/Dockerfile) ## Image Variants @@ -58,11 +58,11 @@ Note: `alpine`,`stretch` and `slim` might come later. 3. Commit locally as one commit and indicate which versions have changed in the commit message 4. Build the Docker changes locally and tag it the same way as you want it on docker but exclude the organization. ``` - docker build -f 2.7-16/buster/Dockerfile -t ruby-node-yarn:2.7.6-16.17.0-1.22.5 . + docker build -f 2.7-16/buster/Dockerfile -t ruby-node-yarn:2.7.6-16.17.0-1.22.19 . ``` 5. Tag the commit with the same Docker tag that is being added (don't push yet) ``` - git tag 2.7.6-16.17.0-1.22.5 + git tag 2.7.6-16.17.0-1.22.19 ``` 6. If the build succeeds, then push your local Git repo with the pending commit/tag to the remote master branch ``` @@ -72,13 +72,17 @@ Note: `alpine`,`stretch` and `slim` might come later. ``` docker images REPOSITORY TAG IMAGE ID - ruby-node-yarn 2.7.6-16.17.0-1.22.5 76ce3db3e6b6 + ruby-node-yarn 2.7.6-16.17.0-1.22.19 ae3fa68f5d10 - docker tag 76ce3db3e6b6 bbdinc/ruby-node-yarn:2.7.6-16.17.0-1.22.5 - docker tag 76ce3db3e6b6 bbdinc/ruby-node-yarn:latest + docker tag ae3fa68f5d10 benefitsbydesign/ruby-node-yarn:2.7.6-16.17.0-1.22.19 + docker tag ae3fa68f5d10 benefitsbydesign/ruby-node-yarn:latest + docker tag ae3fa68f5d10 bbdinc/ruby-node-yarn:2.7.6-16.17.0-1.22.19 + docker tag ae3fa68f5d10 bbdinc/ruby-node-yarn:latest ``` 8. Final step, is to push the Docker tags to Dockerhub. Reminder, ensure you are logged into Dockerhub hub locally before attempting to push using [docker login](https://docs.docker.com/engine/reference/commandline/login/) ``` - docker push bbdinc/ruby-node-yarn:2.7.6-16.17.0-1.22.5 + docker push benefitsbydesign/ruby-node-yarn:2.7.6-16.17.0-1.22.19 + docker push benefitsbydesign/ruby-node-yarn:latest + docker push bbdinc/ruby-node-yarn:2.7.6-16.17.0-1.22.19 docker push bbdinc/ruby-node-yarn:latest ```