From 33f844fa21807fa411c5ebf4de9263a4e92fa6ff Mon Sep 17 00:00:00 2001 From: Effy Elden Date: Mon, 19 Dec 2022 23:42:49 +1100 Subject: [PATCH 1/2] Regenerate yarn.lock entry for caniuse-lite to use consistent registry --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index abbd51eb9..2e011ab34 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3089,9 +3089,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001400: - version "1.0.30001414" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001414.tgz" - integrity sha512-t55jfSaWjCdocnFdKQoO+d2ct9C59UZg4dY3OnUlSZ447r8pUtIKdp0hpAzrGFultmTC+Us+KpKi4GZl/LXlFg== + version "1.0.30001439" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001439.tgz#ab7371faeb4adff4b74dad1718a6fd122e45d9cb" + integrity sha512-1MgUzEkoMO6gKfXflStpYgZDlFM7M/ck/bgfVCACO5vnAf0fXoNVHdWtqGU+MYca+4bL9Z5bpOVmR33cWW9G2A== chalk@^1.1.3: version "1.1.3" From 0a639c5c08fbe2e8458da720297aa446fff446ca Mon Sep 17 00:00:00 2001 From: Effy Elden Date: Mon, 19 Dec 2022 23:46:00 +1100 Subject: [PATCH 2/2] Fix comment in Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ce7f4d718..7ccbad7f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -75,7 +75,7 @@ RUN apt-get update && \ tini && \ ln -s /opt/mastodon /mastodon -# Note: no, cleaning here since Debian does this automatically +# Note: no cleaning here since Debian does this automatically # See the file /etc/apt/apt.conf.d/docker-clean within the Docker image's filesystem COPY --chown=mastodon:mastodon . /opt/mastodon