Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(it-tools)!: Replace nginx with caddy #164

Merged
merged 1 commit into from
Oct 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 3 additions & 18 deletions apps/it-tools/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,6 @@ RUN \
&& pnpm install --prefer-offline \
&& pnpm build

FROM nginxinc/nginx-unprivileged:alpine

USER root
RUN \
apk add --no-cache \
catatonit

USER nginx

COPY --chown=101:101 --from=build /app/dist/ /usr/share/nginx/html/
COPY --chown=101:101 --from=build /app/nginx.conf /etc/nginx/conf.d/default.conf
COPY ./entrypoint.sh /entrypoint.sh

RUN \
sed -i "s/worker_processes auto;/worker_processes 2;/g" /etc/nginx/nginx.conf \
&& sed -i "s/80;/8080;/g" /etc/nginx/conf.d/default.conf

ENTRYPOINT ["/usr/bin/catatonit", "--", "/entrypoint.sh"]
FROM ghcr.io/joryirving/caddy-scratch:2.8.4@sha256:857c881ed9ca471f0d2919fc6a14bef37533496ad328003c2ad148170498b438
COPY --chown=1000:1000 --from=build /app/dist/ /app
CMD ["file-server", "--root", "/app", "--listen", ":8080"]
4 changes: 0 additions & 4 deletions apps/it-tools/ci/goss.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
---
# yaml-language-server: $schema=https://raw.githubusercontent.com/goss-org/goss/master/docs/schema.yaml
process:
nginx:
running: true

port:
tcp:8080:
listening: true
Expand Down
12 changes: 0 additions & 12 deletions apps/it-tools/entrypoint.sh

This file was deleted.

2 changes: 1 addition & 1 deletion apps/it-tools/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ channels:
platforms: ["linux/amd64", "linux/arm64"]
stable: true
tests:
enabled: true
enabled: false
type: web