diff --git a/CHANGELOG.md b/CHANGELOG.md index 32c226470..53b7d428d 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). +## [4.0.1] - 2024-02-01 +### Added +* *Nothing* + +### Changed +* [#821](https://github.com/shlinkio/shlink-web-client/issues/821) Update app gif from README.md + +### 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 27c59d856..bacac4942 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,9 +7,16 @@ 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 -USER $UID COPY config/docker/nginx.conf /etc/nginx/conf.d/default.conf COPY scripts/docker/servers_from_env.sh /docker-entrypoint.d/30-shlink-servers-json.sh 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 + +# Switch to non-privileged UID as the last step +USER $UID diff --git a/README.md b/README.md index 948285933..eea8924d3 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,10 @@ [![GitHub release](https://img.shields.io/github/release/shlinkio/shlink-web-client.svg?style=flat-square)](https://github.com/shlinkio/shlink-web-client/releases/latest) [![Docker pulls](https://img.shields.io/docker/pulls/shlinkio/shlink-web-client.svg?logo=docker&style=flat-square)](https://hub.docker.com/r/shlinkio/shlink-web-client/) [![GitHub license](https://img.shields.io/github/license/shlinkio/shlink-web-client.svg?style=flat-square)](https://github.com/shlinkio/shlink-web-client/blob/main/LICENSE) -[![Twitter](https://img.shields.io/badge/follow-shlinkio-blue.svg?style=flat-square&logo=x&color=black)](https://twitter.com/shlinkio) + [![Mastodon](https://img.shields.io/mastodon/follow/109329425426175098?color=%236364ff&domain=https%3A%2F%2Ffosstodon.org&label=follow&logo=mastodon&logoColor=white&style=flat-square)](https://fosstodon.org/@shlinkio) +[![Twitter](https://img.shields.io/badge/follow-shlinkio-blue.svg?style=flat-square&logo=x&color=black)](https://twitter.com/shlinkio) +[![Bluesky](https://img.shields.io/badge/follow-shlinkio-0285FF.svg?style=flat-square&logo=bluesky&logoColor=white)](https://bsky.app/profile/shlinkio.bsky.social) [![Paypal Donate](https://img.shields.io/badge/Donate-paypal-blue.svg?style=flat-square&logo=paypal&colorA=cccccc)](https://slnk.to/donate) A ReactJS-based progressive web application for [Shlink](https://shlink.io). diff --git a/shlink-web-client.gif b/shlink-web-client.gif index f48778d24..a2157eb18 100644 Binary files a/shlink-web-client.gif and b/shlink-web-client.gif differ