Skip to content

Commit 16ae88f

Browse files
committed
Merge branch 'release-2.14.0' into release
2 parents af3d766 + 607b1fa commit 16ae88f

File tree

20 files changed

+31552
-33696
lines changed

20 files changed

+31552
-33696
lines changed

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM node:16.14.2 as base
1+
FROM node:16.14.2 AS base
22
ENV APP_HOME=/usr/src/app \
33
TERM=xterm
44
RUN mkdir -p $APP_HOME
55
WORKDIR $APP_HOME
66
EXPOSE 8000
77
EXPOSE 8002
88

9-
FROM base as development
9+
FROM base AS development
1010
ENV NODE_ENV development
1111
COPY package.json package-lock.json ./
1212
RUN npm install
@@ -18,11 +18,11 @@ COPY translations/locales ./translations/locales
1818
COPY public ./public
1919
CMD ["npm", "start"]
2020

21-
FROM development as build
21+
FROM development AS build
2222
ENV NODE_ENV production
2323
RUN npm run build
2424

25-
FROM base as production
25+
FROM base AS production
2626
ENV NODE_ENV=production
2727
COPY package.json package-lock.json index.js ./
2828
RUN npm install --production

contributor_docs/installation.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ Note that this takes up a significant amount of space on your machine. Make sure
5050
2. Install [Docker Desktop](https://www.docker.com/products/docker-desktop/)
5151
3. Clone this repository and cd into it
5252
4. `$ docker-compose -f docker-compose-development.yml build`
53+
* Note: Depending on which version of Docker Compose you are using, the base command will be either `docker-compose` or `docker compose`. More information about it can be found in Docker Compose's documentation for their [V1 to V2 transition](https://github.com/docker/compose/tree/v1?tab=readme-ov-file#v1-vs-v2-transition-hourglass_flowing_sand).
5354
5. `$ cp .env.example .env`
5455
6. (Optional) Update `.env` with necessary keys to enable certain app behaviors, i.e. add Github ID and Github Secret if you want to be able to log in with Github.
5556
* See the [GitHub API Configuration](#github-api-configuration) section for information on how to authenticate with Github.

docker-compose-development.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
version: '3.4'
21
services:
32
mongo:
4-
image: mongo:4.4
3+
image: mongo:5.0
54
volumes:
65
- dbdata:/data/db
76
app:

docker-compose.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
version: '3.4'
21
services:
32
mongo:
4-
image: mongo:4.4
3+
image: mongo:5.0
54
volumes:
65
- dbdata:/data/db
76
app:

0 commit comments

Comments
 (0)