Skip to content

Commit

Permalink
Updating Ruby 2.7 (2.7.6) Dockerfile with Yarn 1.22.19
Browse files Browse the repository at this point in the history
- Adding the new benefitsbydesign/ruby-node-yarn docker repo to the readme instructions
  • Loading branch information
kevinbbd committed Sep 12, 2022
1 parent 6e070a3 commit 82f35a1
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 18 deletions.
2 changes: 1 addition & 1 deletion 2.7-10/buster/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion 2.7-11/buster/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion 2.7-12/buster/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion 2.7-13/buster/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion 2.7-14/buster/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion 2.7-15/buster/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion 2.7-16/buster/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion 2.7-8/buster/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion 2.7-9/buster/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
22 changes: 13 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
```
Expand All @@ -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
```

0 comments on commit 82f35a1

Please sign in to comment.