Skip to content

Commit

Permalink
Merge pull request #299 from dolthub/taylor/fix-2
Browse files Browse the repository at this point in the history
.github,docker: Fix logo image, docker platforms
  • Loading branch information
tbantle22 authored Nov 18, 2024
2 parents 7b9233c + 08f72f6 commit 9141d67
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cd-push-docker-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
with:
platforms: linux/amd64,linux/x86_64,linux/arm64/v8
platforms: linux/amd64,linux/arm64
- name: Build and push image
uses: docker/build-push-action@v3
with:
platforms: linux/amd64
platforms: linux/amd64,linux/arm64
context: .
file: ./docker/Dockerfile
push: true
Expand Down
8 changes: 4 additions & 4 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
###################
# BUILD GRAPHQL SERVER
###################
FROM --platform=linux/amd64 node:18.19.0-alpine3.19 as graphql-base
FROM node:18.19.0-alpine3.19 as graphql-base

FROM graphql-base AS graphql-deps
WORKDIR /app/graphql-server
Expand Down Expand Up @@ -40,7 +40,7 @@ USER node
###################
# BUILD NEXT.JS SERVER
###################
FROM --platform=linux/amd64 node:18.19.0-alpine3.19 as web-base
FROM node:18.19.0-alpine3.19 as web-base

# Install dependencies only when needed
FROM web-base AS web-deps
Expand Down Expand Up @@ -69,7 +69,7 @@ RUN yarn run build
###################
# COMBINE
###################
FROM --platform=linux/amd64 node:18.19.0-alpine3.19 AS production
FROM node:18.19.0-alpine3.19 AS production

# Set the working directory
WORKDIR /app
Expand All @@ -85,7 +85,7 @@ COPY --chown=node:node --from=graphql-build /app/graphql-server/dist ./graphql-s

EXPOSE 9002

COPY --from=web-build /app/web/renderer/public ./web/public
COPY --from=web-build /app/web/renderer/public ./web/renderer/public

# Automatically leverage output traces to reduce image size
# https://nextjs.org/docs/advanced-features/output-file-tracing
Expand Down

0 comments on commit 9141d67

Please sign in to comment.