use new version

This commit is contained in:
Sebastian Hugentobler 2019-11-02 15:41:08 +01:00
parent 8de78c1c5b
commit f6207a102b
2 changed files with 6 additions and 2 deletions

View File

@ -11,7 +11,7 @@ RUN apk add --no-cache \
RUN npm config set unsafe-perm true RUN npm config set unsafe-perm true
RUN npm install -g webpack webpack-cli RUN npm install -g webpack webpack-cli
ENV WIKIJS_VERSION=0cc3fd03a5d13aa5a9649080cbce39e507dc23ca ENV WIKIJS_VERSION=f47e27332e54f6105a5aab8c9a95a3ebaed3ba7a
RUN git clone https://code.vanwa.ch/sebastian/wikijs.git -b nextcloud-auth /build RUN git clone https://code.vanwa.ch/sebastian/wikijs.git -b nextcloud-auth /build

View File

@ -1,9 +1,13 @@
#!/usr/bin/with-contenv sh #!/usr/bin/with-contenv sh
if [ "$DB_TYPE" == "postgres" ]; then FIXED_FILE=/home/wikijs/data/pgfixed
if [ "$DB_TYPE" == "postgres" ] && [ ! -f "$FIXED_FILE" ]; then
# starting at 3 because the default groups and user mess things up otherwise # starting at 3 because the default groups and user mess things up otherwise
psql --host "$DB_HOST" --port "$DB_PORT" --username "$DB_USER" --dbname "$DB_NAME" --command \ psql --host "$DB_HOST" --port "$DB_PORT" --username "$DB_USER" --dbname "$DB_NAME" --command \
"ALTER SEQUENCE users_id_seq RESTART WITH 3;" "ALTER SEQUENCE users_id_seq RESTART WITH 3;"
sql --host "$DB_HOST" --port "$DB_PORT" --username "$DB_USER" --dbname "$DB_NAME" --command \ sql --host "$DB_HOST" --port "$DB_PORT" --username "$DB_USER" --dbname "$DB_NAME" --command \
"ALTER SEQUENCE groups_id_seq RESTART WITH 3;" "ALTER SEQUENCE groups_id_seq RESTART WITH 3;"
touch "$FIXED_FILE"
fi fi