Skip to content

Commit 6c7390f

Browse files
marcolarosamarcolarosa
committed
tag and bump version
1 parent 78e3a43 commit 6c7390f

13 files changed

+81
-12854
lines changed

‎Dockerfile.api-build

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ RUN npm run build:production
66

77
FROM --platform=$TARGETPLATFORM node:18-bullseye-slim
88
WORKDIR /srv/api
9+
LABEL org.opencontainers.image.source=https://github.com/CoEDL/nyingarn-workspace
10+
LABEL org.opencontainers.image.description="The Nyingarn Workspace API container"
11+
LABEL org.opencontainers.image.licenses=GPLv3
12+
913
RUN apt-get update && apt-get install -y postgresql-client ca-certificates
1014
COPY --from=api-builder /srv/dist/package.json /srv/api/package.json
1115
COPY --from=api-builder /srv/dist/package-lock.json /srv/api/package-lock.json

‎Dockerfile.tasks-build

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ RUN npm run build:production
77

88
FROM node:18-bullseye-slim
99
WORKDIR /srv
10+
LABEL org.opencontainers.image.source=https://github.com/CoEDL/nyingarn-workspace
11+
LABEL org.opencontainers.image.description="The Nyingarn Workspace Tasks container"
12+
LABEL org.opencontainers.image.licenses=GPLv3
13+
1014
RUN apt-get update && apt-get install -y ca-certificates
1115
COPY --from=tasks-builder /srv/tasks/package.json /srv/package.json
1216
COPY --from=tasks-builder /srv/tasks/package-lock.json /srv/package-lock.json

‎Dockerfile.tus-build

+4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
FROM tusproject/tusd
2+
LABEL org.opencontainers.image.source=https://github.com/CoEDL/nyingarn-workspace
3+
LABEL org.opencontainers.image.description="The Nyingarn Workspace TUSD container"
4+
LABEL org.opencontainers.image.licenses=GPLv3
5+
26
USER root
37
RUN apk update && apk add aws-cli jq bash curl
48
RUN mkdir -p /root/.aws

‎Dockerfile.ui-build

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
FROM nginx:latest
2+
LABEL org.opencontainers.image.source=https://github.com/CoEDL/nyingarn-workspace
3+
LABEL org.opencontainers.image.description="The Nyingarn Workspace UI container"
4+
LABEL org.opencontainers.image.licenses=GPLv3
25

36
RUN apt-get update && apt-get install -y nginx-extras
47
RUN rm /etc/nginx/conf.d/default.conf /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default

‎api/package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "api",
3-
"version": "0.37.0",
3+
"version": "0.37.1",
44
"description": "",
55
"author": "Marco La Rosa",
66
"main": "index.js",

‎api/webpack.production.cjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module.exports = {
99
entry: "./index.js",
1010
output: {
1111
path: path.resolve(__dirname, "dist"),
12-
filename: "server.bundle.js",
12+
filename: "server.bundle.cjs",
1313
},
1414
optimization: {
1515
nodeEnv: false,

‎build-production-containers.sh

+20-9
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ if [ "$#" != 1 ] ; then
66
fi
77
VERSION="${1}"
88

9+
read -p '>> What is your github username? ' GITHUB_USERNAME
10+
if [ -z "$GITHUB_USERNAME" ] ; then
11+
echo "Please provide your github username."
12+
exit -1
13+
fi
14+
915
read -p '>> Tag the repo (select N if you are still testing the builds)? [y|N] ' resp
1016
if [ "$resp" == "y" ] ; then
1117
cd api
@@ -22,29 +28,34 @@ fi
2228

2329
read -p '>> Build the containers and push to docker hub? [y|N] ' resp
2430
if [ "$resp" == "y" ] ; then
25-
docker login
31+
32+
echo ""
33+
echo "Logging in to Github Container Registry"
34+
echo " Provide a personal access token with the appropriate permissions"
35+
echo ""
36+
docker login ghcr.io --username GITHUB_USERNAME
2637

2738
docker buildx build --push --rm --platform=linux/amd64,linux/arm64 \
28-
-t arkisto/workspace-api:latest \
29-
-t arkisto/workspace-api:${VERSION} \
39+
-t ghcr.io/coedl/nyingarn-workspace-api:latest \
40+
-t ghcr.io/coedl/nyingarn-workspace-api:${VERSION} \
3041
-f Dockerfile.api-build .
3142

3243
docker buildx build --push --rm --platform=linux/amd64,linux/arm64 \
33-
-t arkisto/workspace-task-runner:latest \
34-
-t arkisto/workspace-task-runner:${VERSION} \
44+
-t ghcr.io/coedl/nyingarn-workspace-task-runner:latest \
45+
-t ghcr.io/coedl/nyingarn-workspace-task-runner:${VERSION} \
3546
-f Dockerfile.tasks-build .
3647

3748
docker run -it --rm \
3849
-v $PWD/ui:/srv/ui \
3950
-v ui_node_modules:/srv/ui/node_modules \
4051
-w /srv/ui node:14-buster bash -l -c "npm run build"
4152
docker buildx build --push --rm --platform linux/amd64,linux/arm64 \
42-
-t arkisto/workspace-ui:latest \
43-
-t arkisto/workspace-ui:${VERSION} \
53+
-t ghcr.io/coedl/nyingarn-workspace-ui:latest \
54+
-t ghcr.io/coedl/nyingarn-workspace-ui:${VERSION} \
4455
-f Dockerfile.ui-build .
4556

4657
docker buildx build --push --rm --platform linux/amd64,linux/arm64 \
47-
-t arkisto/workspace-tusd:latest \
48-
-t arkisto/workspace-tusd:${VERSION} \
58+
-t ghcr.io/coedl/nyingarn-workspace-tusd:latest \
59+
-t ghcr.io/coedl/nyingarn-workspace-tusd:${VERSION} \
4960
-f Dockerfile.tus-build .
5061
fi

‎tasks/package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tasks/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "tasks",
3-
"version": "0.37.0",
3+
"version": "0.37.1",
44
"description": "",
55
"author": "Marco La Rosa",
66
"main": "index.js",

‎tasks/webpack.production.cjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module.exports = {
99
entry: "./index.js",
1010
output: {
1111
path: path.resolve(__dirname, "dist"),
12-
filename: "server.bundle.js",
12+
filename: "server.bundle.cjs",
1313
},
1414
optimization: {
1515
nodeEnv: false,

0 commit comments

Comments
 (0)