From 713c13f5020ea6af1452787080b13f82705e1fe3 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Tue, 30 Jan 2024 18:07:44 +0100 Subject: [PATCH] Update changelog --- CHANGELOG.md | 17 +++++++++++++++++ Dockerfile | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32c22647..c1e40cec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org). +## [Unreleased] +### Added +* *Nothing* + +### Changed +* *Nothing* + +### Deprecated +* *Nothing* + +### Removed +* *Nothing* + +### Fixed +* [#1046](https://github.com/shlinkio/shlink-web-client/issues/1046) Fix running docker image when server env vars are provided. + + ## [4.0.0] - 2024-01-29 ### Added * [shlink-web-component #7](https://github.com/shlinkio/shlink-web-component/issues/7) Allow comparing visits for multiple short URLs, tags or domains. diff --git a/Dockerfile b/Dockerfile index 5821dcd0..bacac494 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,7 @@ RUN cd /shlink-web-client && npm ci && npm run build FROM nginxinc/nginx-unprivileged:1.25-alpine ARG UID=101 LABEL maintainer="Alejandro Celaya " + USER root RUN rm -r /usr/share/nginx/html && rm /etc/nginx/conf.d/default.conf COPY config/docker/nginx.conf /etc/nginx/conf.d/default.conf @@ -15,7 +16,7 @@ COPY --from=node /shlink-web-client/build /usr/share/nginx/html # This is required by 30-shlink-servers-json.sh to be writable for UID RUN echo '[]' > /usr/share/nginx/html/servers.json \ - && chown $UID:0 /usr/share/nginx/html/servers.json + && chown $UID:0 /usr/share/nginx/html/servers.json # Switch to non-privileged UID as the last step USER $UID