Skip to content

Commit

Permalink
Merge branch 'stable' into add-board-change
Browse files Browse the repository at this point in the history
  • Loading branch information
WikiRik authored Sep 26, 2023
2 parents f349219 + a76f172 commit 50d8b79
Show file tree
Hide file tree
Showing 12 changed files with 1,831 additions and 1,480 deletions.
12 changes: 6 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version: 2.1
jobs:
build:
docker:
- image: cimg/base:2023.05
- image: cimg/base:2023.09
resource_class: large
steps:
- checkout
Expand All @@ -17,7 +17,7 @@ jobs:
- run: docker-compose -f docker/docker-compose.yml -f docker/docker-compose.dev.yml build --no-cache frontend
eslint:
docker:
- image: cimg/node:18.16.0
- image: cimg/node:18.18.0
resource_class: large
steps:
- checkout
Expand All @@ -31,23 +31,23 @@ jobs:
path: ~/reports
yamllint:
docker:
- image: cimg/python:3.11.3
- image: cimg/python:3.11.5
resource_class: large
steps:
- checkout
- run: pip install yamllint
- run: yamllint -d .yamllint.yml .
shellcheck:
docker:
- image: cimg/base:2023.05
- image: cimg/base:2023.09
resource_class: large
steps:
- checkout
- shellcheck/install
- shellcheck/check
audit:
docker:
- image: cimg/node:18.16.0
- image: cimg/node:18.18.0
resource_class: large
steps:
- checkout
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
}
docker-build-and-push:
docker:
- image: cimg/node:18.16.0
- image: cimg/node:18.18.0
resource_class: large
steps:
- checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
## [1.33.37](https://github.com/AEGEE/frontend/compare/1.33.36...1.33.37) (2023-09-13)


### Bug Fixes

* **core:** sort some fields in bodies list. Fixes HELP-2298 ([#1853](https://github.com/AEGEE/frontend/issues/1853)) ([a42ae3d](https://github.com/AEGEE/frontend/commit/a42ae3deb55b97865aeb1ab0adc59751950bb4c0))

## [1.33.36](https://github.com/AEGEE/frontend/compare/1.33.35...1.33.36) (2023-09-11)


### Bug Fixes

* **statutory:** add views for missing and without fee memberlists ([#1852](https://github.com/AEGEE/frontend/issues/1852)) ([526e8c7](https://github.com/AEGEE/frontend/commit/526e8c7fb8f6c6175a975c5fee064e9bd033159d))

## [1.33.35](https://github.com/AEGEE/frontend/compare/1.33.34...1.33.35) (2023-08-15)


### Bug Fixes

* **events:** add email to application modal ([#1827](https://github.com/AEGEE/frontend/issues/1827)) ([b6cc741](https://github.com/AEGEE/frontend/commit/b6cc74146704677937872be167e5eb448494c335))

## [1.33.34](https://github.com/AEGEE/frontend/compare/1.33.33...1.33.34) (2023-07-10)


Expand Down
6 changes: 3 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# FIXME use alpine
FROM node:18.17.0 AS builder
FROM node:18.18.0 AS builder

COPY . /usr/app/src
WORKDIR /usr/app/src
Expand All @@ -8,7 +8,7 @@ RUN npm pkg delete scripts.prepare \
&& npm ci --omit=dev \
&& npm run build

FROM nginx:1.25.1-alpine
FROM nginx:1.25.2-alpine

RUN adduser -D -H -u 1000 -s /bin/bash www-data -G www-data

Expand All @@ -19,7 +19,7 @@ COPY ./docker/frontend-nginx/sites/default.conf /etc/nginx/sites-available/defau
# it has some default settings there which result in displaying
# the default nginx page, which is not what we need
RUN rm -rf /etc/nginx/conf.d \
&& apk --no-cache add curl=8.1.2-r0 \
&& apk --no-cache add curl=8.2.1-r0 \
&& chown -R www-data:www-data /usr/app/

WORKDIR /usr/app/src/dist
Expand Down
Loading

0 comments on commit 50d8b79

Please sign in to comment.