diff options
| author | 파링 <paring@pikokr.dev> | 2023-02-08 17:59:10 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-08 17:59:10 +0900 |
| commit | dee662705e639ead775c62da4ae408625c5338d1 (patch) | |
| tree | ea06fd2fe7e138c58ba515f4d72fad339d09aa4c /Dockerfile | |
| parent | fix(server): validate url from ap to improve security (diff) | |
| download | misskey-dee662705e639ead775c62da4ae408625c5338d1.tar.gz misskey-dee662705e639ead775c62da4ae408625c5338d1.tar.bz2 misskey-dee662705e639ead775c62da4ae408625c5338d1.zip | |
fix docker health check (#9810)
* fix(healthcheck): use default commands instead of yq
this removes yq command and uses grep and awk to get port
* fix: use correct config file
* fix: install curl in runner instead of builder
* fix: remove unused packages
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Dockerfile b/Dockerfile index 89a8d38f8c..0bfd24bd9a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,9 +8,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ ; echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \ && apt-get update \ && apt-get install -yqq --no-install-recommends \ - build-essential wget ca-certificates \ - && wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/bin/yq \ - && chmod +x /usr/bin/yq + build-essential RUN corepack enable @@ -44,7 +42,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ ; echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \ && apt-get update \ && apt-get install -y --no-install-recommends \ - ffmpeg tini \ + ffmpeg tini curl \ && corepack enable \ && groupadd -g "${GID}" misskey \ && useradd -l -u "${UID}" -g "${GID}" -m -d /misskey misskey \ @@ -54,7 +52,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ USER misskey WORKDIR /misskey -COPY --from=builder /usr/bin/yq /usr/bin/yq COPY --chown=misskey:misskey --from=builder /misskey/node_modules ./node_modules COPY --chown=misskey:misskey --from=builder /misskey/built ./built COPY --chown=misskey:misskey --from=builder /misskey/packages/backend/node_modules ./packages/backend/node_modules |