diff --git a/Dockerfile b/Dockerfile index d4d185fb7..801b2bc20 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,8 +23,7 @@ ENV BASE_PATH $BASE_PATH ENV NEXT_TELEMETRY_DISABLED 1 -RUN ALLOWED_FRAME_URLS=/__ENTRYPOINT__ yarn build-docker -ENV ALLOWED_FRAME_URLS="" +RUN yarn build-docker # Production image, copy all the files and run next FROM node:18-alpine AS runner @@ -52,10 +51,6 @@ COPY --from=builder /app/scripts ./scripts COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./ COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static -# Create entrypoint script -COPY entrypoint.sh ./entrypoint.sh -RUN chmod +x ./entrypoint.sh - USER nextjs EXPOSE 3000 @@ -63,6 +58,4 @@ EXPOSE 3000 ENV HOSTNAME 0.0.0.0 ENV PORT 3000 -ENTRYPOINT ["./entrypoint.sh"] - CMD ["yarn", "start-docker"] diff --git a/entrypoint.sh b/entrypoint.sh deleted file mode 100644 index 4920d167d..000000000 --- a/entrypoint.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -# replace /__ENTRYPOINT__ with the runtime-configured entrypoint -if [ "$ALLOWED_FRAME_URLS" = "" ]; then - # root entrypoint is handled differently from non-root, in particular - # - basePath="" rather than "/" - # - an extra redirect is added /x/ => /x -- but with root that would be // => / which is invalid - cp .next/routes-manifest.json .next/routes-manifest.json.in - jq -rc '.basePath = "" - | .redirects = [ - .redirects - | .[] - | select((.source == "/__ENTRYPOINT__/" and .destination == "/__ENTRYPOINT__") | not) - ]' .next/routes-manifest.json.in > .next/routes-manifest.json -fi - -escaped_frame_urls=$(echo "$ALLOWED_FRAME_URLS" | sed 's/\//\\\//g') - -echo "Replacing /__ENTRYPOINT__ in all .next file..." -find .next -type f -exec sed -i 's/\/__ENTRYPOINT__/'"${escaped_frame_urls}"'/g' {} + - -# Check if any replacements were made in .next files -if [ $? -eq 0 ]; then - echo "Replacements in .next completed." -else - echo "No replacements made in .next or an error occurred." -fi - -# Replace /__ENTRYPOINT__ in server.js -echo "Replacing /__ENTRYPOINT__ in server.js..." -sed -i "s/\/__ENTRYPOINT__/${escaped_frame_urls}/g" server.js - -# Check if any replacements were made in server.js -if [ $? -eq 0 ]; then - echo "Replacements in server.js completed." -else - echo "No replacements made in server.js or an error occurred." -fi - -$@ \ No newline at end of file