Skip to content

Commit

Permalink
Revert "Merge pull request #134 from LCOGT/dev/argo-cd"
Browse files Browse the repository at this point in the history
This reverts commit a3ce041, reversing
changes made to 631ed36.

Dockerfile build was breaking helm deployment. Reverting to previous state.
This will be reinstated when full argo-cd integration is complete.
  • Loading branch information
LTDakin committed Jan 21, 2025
1 parent ecc6f62 commit ac48161
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 1,198 deletions.
13 changes: 0 additions & 13 deletions .github/workflows/cd.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,3 @@ pnpm-debug.log*
*.njsproj
*.sln
*.sw?

# Devops
.devenv
.pre-commit-config.yaml
local-kubeconfig
21 changes: 20 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,25 @@
FROM node:16 AS builder
FROM node:16 as builder
WORKDIR /app
COPY package*.json ./
RUN npm install
COPY ./ .
RUN npm run build

FROM nginx:1.15-alpine
RUN mkdir -p /app && rm -rf /etc/nginx/conf.d/default.conf
COPY --from=builder /app/dist /app
RUN echo -e " server {\n" \
" listen 8989;\n" \
" listen [::]:8989;\n" \
" server_name localhost;\n" \
" location / {\n" \
" root /app;\n" \
" index index.html;\n" \
" try_files \$uri \$uri/ /index.html;\n" \
" add_header 'Cross-Origin-Embedder-Policy' 'require-corp';\n" \
" add_header 'Cross-Origin-Opener-Policy' 'same-origin';\n" \
" }\n" \
" }\n" \
> /etc/nginx/conf.d/datalab.conf

ENTRYPOINT [ "nginx", "-g", "daemon off;" ]
Loading

0 comments on commit ac48161

Please sign in to comment.