Skip to content
This repository has been archived by the owner on Jan 24, 2024. It is now read-only.

Commit

Permalink
Merge pull request #8 from ssl-leiden/various-updates
Browse files Browse the repository at this point in the history
 Update dependencies and software versions
  • Loading branch information
jnoordsij authored Dec 12, 2023
2 parents 8a813c2 + 8acf1aa commit b7f3216
Show file tree
Hide file tree
Showing 12 changed files with 3,352 additions and 3,741 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/publish-docker-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ on:

env:
GO_VERSION: "1.21"
NODE_VERSION: "20.5.1"
OPENVPN_VERSION: "2.6.5"
NODE_VERSION: "20"
OPENVPN_VERSION: "2.6.8"

REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}/ovpn-admin
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.openvpn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.16
FROM alpine:3.19
RUN apk add --update bash openvpn easy-rsa iptables && \
ln -s /usr/share/easy-rsa/easyrsa /usr/local/bin && \
wget https://github.com/pashcovich/openvpn-user/releases/download/v1.0.4/openvpn-user-linux-amd64.tar.gz -O - | tar xz -C /usr/local/bin && \
Expand Down
541 changes: 0 additions & 541 deletions frontend/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

This file was deleted.

874 changes: 0 additions & 874 deletions frontend/.yarn/releases/yarn-3.6.1.cjs

This file was deleted.

893 changes: 893 additions & 0 deletions frontend/.yarn/releases/yarn-4.0.2.cjs

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions frontend/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
plugins:
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"
enableGlobalCache: false

yarnPath: .yarn/releases/yarn-3.6.1.cjs
yarnPath: .yarn/releases/yarn-4.0.2.cjs
5 changes: 2 additions & 3 deletions frontend/build.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/bin/bash

image="node:16.13.0-alpine3.12"
image="node:20-alpine"
uid="$(id -u $USER)"

docker run -u $uid -w /app -v $(pwd):/app $image npm i && \
docker run -u $uid -w /app -v $(pwd):/app $image npm run build
docker run -u $uid -w /app -v $(pwd):/app $image yarn install && yarn run build
16 changes: 8 additions & 8 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
"build": "cross-env NODE_ENV=production webpack --progress"
},
"dependencies": {
"axios": "^1.5.1",
"axios": "^1.6.2",
"bootstrap": "^4.6.2",
"bootstrap-vue": "^2.23.1",
"normalize.css": "^8.0.1",
"vue": "^2.7.14",
"vue": "^2.7.15",
"vue-clipboard2": "^0.3.3",
"vue-cookies": "^1.8.3",
"vue-good-table": "^2.21.11",
Expand All @@ -27,22 +27,22 @@
"not ie <= 8"
],
"devDependencies": {
"@babel/core": "^7.23.0",
"@babel/core": "^7.23.5",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-json-strings": "^7.18.6",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-syntax-import-meta": "^7.10.4",
"@babel/preset-env": "^7.22.20",
"@babel/preset-env": "^7.23.5",
"babel-loader": "^9.1.3",
"cross-env": "^7.0.3",
"css-loader": "^6.8.1",
"file-loader": "^6.2.0",
"terser-webpack-plugin": "^5.3.9",
"vue-loader": "^17.2.2",
"vue-template-compiler": "^2.7.14",
"webpack": "^5.88.2",
"vue-loader": "^17.3.1",
"vue-template-compiler": "^2.7.15",
"webpack": "^5.89.0",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^4.15.1"
},
"packageManager": "yarn@3.6.1"
"packageManager": "yarn@4.0.2"
}
Loading

0 comments on commit b7f3216

Please sign in to comment.