Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/word-wrap-1.2.4
Browse files Browse the repository at this point in the history
  • Loading branch information
mpfeil authored Oct 2, 2023
2 parents 2dbf327 + 6b283a9 commit d3e7ffc
Show file tree
Hide file tree
Showing 25 changed files with 1,074 additions and 816 deletions.
1 change: 1 addition & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
- [ ] Chore (update dependencies or documentation)

## Checklist:
<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
name: Deploy docs
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Gather branch information
id: version_info
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/registry.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@ jobs:

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

- name: Log in to the Container registry
uses: docker/login-action@v2.2.0
uses: docker/login-action@v3.0.0
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GHCR_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v4.6.0
uses: docker/metadata-action@v5.0.0
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
flavor: |
Expand All @@ -41,7 +41,7 @@ jobs:
suffix=
- name: Build and push Docker image
uses: docker/build-push-action@v4.1.1
uses: docker/build-push-action@v5.0.0
with:
context: .
push: true
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
name: Lint code
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install Node.js 16
uses: actions/setup-node@v3.6.0
uses: actions/setup-node@v3.8.1
with:
node-version: 16

Expand All @@ -26,7 +26,7 @@ jobs:
echo "##[set-output name=dir;]$(yarn cache dir)"
- name: Restore yarn cache
uses: actions/cache@v3.3.1
uses: actions/cache@v3.3.2
id: yarn-cache
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
Expand All @@ -46,7 +46,7 @@ jobs:
name: Run tests
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Execute tests
run: |
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Used best practices from https://snyk.io/blog/10-best-practices-to-containerize-nodejs-web-applications-with-docker/

# --------------> The build image
FROM node:16.19.0-bullseye-slim as build
FROM node:18.17.1-bullseye-slim as build

RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends git dumb-init

Expand All @@ -23,7 +23,7 @@ COPY . /usr/src/app
RUN yarn create-version-file

# --------------> The production image
FROM node:16.19.0-bullseye-slim
FROM node:18.17.1-bullseye-slim

ENV NODE_ENV=production
COPY --from=build /usr/bin/dumb-init /usr/bin/dumb-init
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@
},
"devDependencies": {
"@sensebox/eslint-config-sensebox": "^1.1.0",
"@turf/invariant": "^6.1.2",
"@turf/invariant": "^6.5.0",
"chai": "^4.3.4",
"chai-http": "^4.3.0",
"chakram": "^1.5.0",
"cheerio": "^1.0.0-rc.6",
"csv-parse": "^4.15.4",
"eslint": "7.26.0",
"mimelib": "^0.3.1",
"mocha": "^8.3.2",
"mqtt": "^4.2.8",
"mocha": "^10.2.0",
"mqtt": "^5.0.5",
"randomgeojson": "^1.0.0"
},
"version": "0.0.0"
Expand Down
Loading

0 comments on commit d3e7ffc

Please sign in to comment.