Skip to content

Commit

Permalink
Merge pull request #302 from microbiomedata/301-delete-obsolete-docke…
Browse files Browse the repository at this point in the history
…rfiles-ie-the-ones-for-node-v16-and-node-v18

Delete `Dockerfile`s specific to old Node versions (v16 and v18)
  • Loading branch information
eecavanna authored Sep 20, 2024
2 parents f3f35b6 + f507fb8 commit 599a966
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 238 deletions.
2 changes: 0 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

# We won't benefit from the container image, itself, having access to these files.
/.dockerignore
/webapp-node16.Dockerfile
/webapp-node18.Dockerfile
/docker-compose.yml

# The container image's copies of these directories will be generated
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-and-push-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
uses: docker/build-push-action@v5
with:
context: .
file: webapp-node20.Dockerfile
file: Dockerfile
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
Expand Down
2 changes: 1 addition & 1 deletion webapp-node20.Dockerfile → Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM node:20-alpine

# Add metadata to the Docker image.
# Reference: https://docs.docker.com/engine/reference/builder/#label
LABEL org.opencontainers.image.description="NMDC EDGE Web App (Node v20)"
LABEL org.opencontainers.image.description="NMDC EDGE Web App"
LABEL org.opencontainers.image.source="https://github.com/microbiomedata/nmdc-edge"

# Create an environment variable that contains the web app version identifier.
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:

# The NMDC EDGE web app (both client and server).
webapp:
build: { context: ".", dockerfile: "webapp-node20.Dockerfile" }
build: { context: ".", dockerfile: "Dockerfile" }
# Override the container image's default command (i.e. the `CMD` defined in the Dockerfile), so that
# PM2 runs in "watch" mode (i.e. so that PM2 restarts the application whenever a file changes).
# Reference: https://pm2.keymetrics.io/docs/usage/restart-strategies/
Expand Down
2 changes: 1 addition & 1 deletion docs/docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ services:
# Alternatively, to build an image from a Dockerfile (which will allow you to specify args at build time):
#build:
# context: /path/to/repository/root/directory
# dockerfile: webapp-node20.Dockerfile
# dockerfile: Dockerfile
# args:
# - USER_ID: ${USER_ID:-60005}
# - GROUP_ID: ${GROUP_ID:-60005}
Expand Down
4 changes: 2 additions & 2 deletions installation/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## INSTALLATION PREREQUISITES

### Install Node16
https://nodejs.org/dist/latest-v16.x/
### Install Node v20
https://nodejs.org/en/download/prebuilt-installer

### Install pm2
`npm install pm2@latest -g`
Expand Down
112 changes: 0 additions & 112 deletions webapp-node16.Dockerfile

This file was deleted.

118 changes: 0 additions & 118 deletions webapp-node18.Dockerfile

This file was deleted.

0 comments on commit 599a966

Please sign in to comment.