Skip to content

Commit

Permalink
Merge branch 'dev' into test
Browse files Browse the repository at this point in the history
  • Loading branch information
ikethecoder committed Dec 28, 2023
2 parents c3d417a + a2c1f8a commit bd8e74f
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
11 changes: 7 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,23 @@ ENV NEXT_PUBLIC_APP_REVISION=${APP_REVISION}

RUN apk add curl jq

USER node
WORKDIR /app

COPY --chown=node src/*.json ./
COPY src/*.json ./
RUN npm install --legacy-peer-deps

COPY --chown=node src ./
COPY src ./

ARG GITHUB_API_TOKEN
ENV COOKIE_SECRET=change_me

RUN npm run build

ENV HOME=/home/node
# Create the /.npm directory and grant access to group 0 to allow npm v9 to work
# See: https://docs.openshift.com/container-platform/4.11/openshift_images/create-images.html#use-uid_create-images
RUN mkdir /.npm
RUN chgrp -R 0 /.npm && \
chmod -R g=u /.npm

ENTRYPOINT [ "npm", "run" ]
CMD [ "start"]
11 changes: 7 additions & 4 deletions feeds/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,17 @@ ENV APP_VERSION=${APP_VERSION}
ARG APP_REVISION
ENV APP_REVISION=${APP_REVISION}

USER node
WORKDIR /app

COPY --chown=node package*.json ./
COPY package*.json ./
RUN npm install

COPY --chown=node . ./
COPY . ./

ENV HOME=/home/node
# Create the /.npm directory and grant access to group 0 to allow npm v9 to work
# See: https://docs.openshift.com/container-platform/4.11/openshift_images/create-images.html#use-uid_create-images
RUN mkdir /.npm
RUN chgrp -R 0 /.npm && \
chmod -R g=u /.npm

CMD [ "node", "index.js" ]

0 comments on commit bd8e74f

Please sign in to comment.