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

Rebase to 3.20 #41

Merged
merged 1 commit into from
Jun 6, 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
7 changes: 4 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine:3.19
FROM ghcr.io/linuxserver/baseimage-alpine:3.20

# set version label
ARG BUILD_DATE
Expand Down Expand Up @@ -44,17 +44,18 @@ RUN \
yarn install --immutable && \
yarn run build && \
yarn workspaces focus --production && \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
echo "**** cleanup ****" && \
yarn cache clean && \
apk del --purge \
build-dependencies && \
rm -rf \
$HOME/.npm \
$HOME/.yarn \
/tmp/*
/tmp/*

# add local files
COPY root/ /
COPY root/ /

# ports and volumes
EXPOSE 3000
Expand Down
7 changes: 4 additions & 3 deletions Dockerfile.aarch64
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20

# set version label
ARG BUILD_DATE
Expand Down Expand Up @@ -44,17 +44,18 @@ RUN \
yarn install --immutable && \
yarn run build && \
yarn workspaces focus --production && \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
echo "**** cleanup ****" && \
yarn cache clean && \
apk del --purge \
build-dependencies && \
rm -rf \
$HOME/.npm \
$HOME/.yarn \
/tmp/*
/tmp/*

# add local files
COPY root/ /
COPY root/ /

# ports and volumes
EXPOSE 3000
Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ pipeline {
CI_PORT='3000'
CI_SSL='false'
CI_DELAY='120'
CI_DOCKERENV='TZ=US/Pacific|CMD_URL_ADDPORT=true|CMD_CSP_ENABLE=false'
CI_AUTH='user:password'
CI_DOCKERENV='CMD_URL_ADDPORT=true|CMD_CSP_ENABLE=false'
CI_AUTH=''
CI_WEBPATH=''
}
stages {
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ HedgeDoc web interface can be accessed `http://${IP}:3000/`, if you want to use

[Full list of HedgeDoc options](https://docs.hedgedoc.org/configuration/)

For convience we provide a working example using Mysql as a backend in this document, if you do not wish to use our custom environment values or a Mysql database backend feel free to leverage any of the settings laid out in the link above.
For convenience we provide a working example using Mysql as a backend in this document, if you do not wish to use our custom environment values or a Mysql database backend feel free to leverage any of the settings laid out in the link above.

To run behind a reverse proxy we have a [preconfigured config](https://github.com/linuxserver/reverse-proxy-confs/blob/master/hedgedoc.subdomain.conf.sample) using docker networking included in our [SWAG](https://github.com/linuxserver/docker-swag) image and you can read how to use this in the [Reverse Proxy Confs repository](https://github.com/linuxserver/reverse-proxy-confs/#how-to-use-these-reverse-proxy-configs)

Expand Down Expand Up @@ -309,6 +309,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

## Versions

* **06.06.24:** - Rebase to Alpine 3.20.
* **23.12.23:** - Rebase to Alpine 3.19.
* **18.06.23:** - Rebase to Alpine 3.18, deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf).
* **02.11.22:** - Rebase to Alpine 3.16, migrate to s6v3.
Expand Down
5 changes: 2 additions & 3 deletions jenkins-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ external_type: github_stable
release_type: stable
release_tag: latest
ls_branch: main
build_armhf: false
repo_vars:
- EXT_GIT_BRANCH = 'master'
- EXT_USER = 'hedgedoc'
Expand All @@ -25,6 +24,6 @@ repo_vars:
- CI_PORT='3000'
- CI_SSL='false'
- CI_DELAY='120'
- CI_DOCKERENV='TZ=US/Pacific|CMD_URL_ADDPORT=true|CMD_CSP_ENABLE=false'
- CI_AUTH='user:password'
- CI_DOCKERENV='CMD_URL_ADDPORT=true|CMD_CSP_ENABLE=false'
- CI_AUTH=''
- CI_WEBPATH=''
4 changes: 2 additions & 2 deletions readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ param_env_vars:
- { env_var: "DB_USER", env_value: "hedgedoc", desc: "Database user" }
- { env_var: "DB_PASS", env_value: "<secret password>", desc: "Database password" }
- { env_var: "DB_NAME", env_value: "hedgedoc", desc: "Database name" }
- { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." }
- { env_var: "CMD_DOMAIN", env_value: "localhost", desc: "The address the gui will be accessed at (ie. `192.168.1.1` or `hedgedoc.domain.com`)." }
opt_param_usage_include_env: true
opt_param_env_vars:
Expand All @@ -47,12 +46,13 @@ app_setup_block: |

[Full list of HedgeDoc options](https://docs.hedgedoc.org/configuration/)

For convience we provide a working example using Mysql as a backend in this document, if you do not wish to use our custom environment values or a Mysql database backend feel free to leverage any of the settings laid out in the link above.
For convenience we provide a working example using Mysql as a backend in this document, if you do not wish to use our custom environment values or a Mysql database backend feel free to leverage any of the settings laid out in the link above.

To run behind a reverse proxy we have a [preconfigured config](https://github.com/linuxserver/reverse-proxy-confs/blob/master/hedgedoc.subdomain.conf.sample) using docker networking included in our [SWAG](https://github.com/linuxserver/docker-swag) image and you can read how to use this in the [Reverse Proxy Confs repository](https://github.com/linuxserver/reverse-proxy-confs/#how-to-use-these-reverse-proxy-configs)

# changelog
changelogs:
- { date: "06.06.24:", desc: "Rebase to Alpine 3.20."}
- { date: "23.12.23:", desc: "Rebase to Alpine 3.19."}
- { date: "18.06.23:", desc: "Rebase to Alpine 3.18, deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf)." }
- { date: "02.11.22:", desc: "Rebase to Alpine 3.16, migrate to s6v3." }
Expand Down