Skip to content

Commit

Permalink
Revert, keep docker changes
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonsturgeon committed Aug 20, 2024
1 parent 033964a commit 3f962fa
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 16 deletions.
17 changes: 6 additions & 11 deletions .github/workflows/update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,10 @@ jobs:
CLOUDFLARE_CACHE_API_KEY: ${{ secrets.CF_CACHE_API_TOKEN }}
run: |
npm run clear_cloudflare_cache
rm deleted_files.json
rm --verbose deleted_files.json
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

# Docker
- name: Login to GitHub Container Registry
Expand All @@ -93,17 +95,10 @@ jobs:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.GH_TOKEN }}

- name: Login to Dockerhub
uses: docker/login-action@v3
with:
username: brandonsturgeon
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build & Push Docker Image
if: ${{ (github.event_name == 'schedule' && (format('{{date:u}}')) == '1') || (github.event_name == 'workflow_dispatch' && github.event.inputs.build_container == 'true') }}
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
push: true
tags: |
ghcr.io/cfc-servers/gmodwiki:latest
brandonsturgeon/gmodwiki:latest
tags: ghcr.io/cfc-servers/gmodwiki:latest
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ COPY package-lock.json /app
COPY node_modules /app/node_modules
RUN npm install

COPY ./build ./build
COPY ./public ./public
COPY ./build /app/build
COPY ./public /app/public
COPY astro.config.mjs .
COPY tsconfig.json .
COPY src ./src
COPY tsconfig.json /app/tsconfig.json
COPY src /app/src

ENV BUILD_ENV=docker
RUN npm run build
Expand All @@ -27,6 +27,6 @@ COPY --from=builder /app/dist /app/dist
ENV HOST=0.0.0.0
ENV PORT=4321
ENV NODE_ENV=production
RUN npm i cookie kleur clsx cssesc server-destroy send path-to-regexp html-escaper
RUN npm i cookie kleur clsx cssesc server-destroy send path-to-regexp@6.2.1 html-escaper
RUN du -sh /app/node_modules
CMD ["node", "/app/dist/server/entry.mjs"]

0 comments on commit 3f962fa

Please sign in to comment.