Compare commits

..

6 Commits

Author SHA1 Message Date
wpetit 4871876bf0 chore: use go run to exec modd 2024-02-27 17:19:16 +01:00
wpetit d47b819e1d feat(docker): use go 1.21 2024-02-27 17:14:25 +01:00
Philippe Caseiro f7bff1b697 fix(docker): image now builds
adding non root user execution capabilities
2024-02-27 17:09:30 +01:00
wpetit 1ce43d2c76 Merge pull request 'build(deps): bump nodejs to 20.x & update node modules' (#4) from upgrade_nodejs into develop
Reviewed-on: wpetit/fake-smtp#4
Reviewed-by: wpetit <wpetit@cadoles.com>
2024-02-27 17:06:16 +01:00
Benjamin Gaudé 75213ebe6e build(deps): update node version 2024-02-27 15:50:00 +01:00
Benjamin Gaudé 6a9c2fd13f build(deps): bump nodejs to 20.x & update node modules 2024-02-27 14:26:12 +01:00
6 changed files with 5214 additions and 6381 deletions

2
.nvmrc
View File

@ -1 +1 @@
v14.16.0 v20.11.1

View File

@ -51,7 +51,7 @@ tidy:
go mod tidy go mod tidy
watch: watch:
modd go run github.com/cortesi/modd/cmd/modd@v0.8.1
lint: lint:
golangci-lint run --enable-all golangci-lint run --enable-all

View File

@ -1,13 +1,13 @@
FROM reg.cadoles.com/dh/library/golang:1.17 AS build FROM reg.cadoles.com/proxy_cache/library/golang:1.21 AS build
ARG HTTP_PROXY= ARG HTTP_PROXY=
ARG HTTPS_PROXY= ARG HTTPS_PROXY=
ARG http_proxy= ARG http_proxy=
ARG https_proxy= ARG https_proxy=
RUN apt-get update && apt-get install -y build-essential git bash curl npm python2 RUN apt-get update && apt-get install -y build-essential git bash curl
RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \ RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - \
&& apt-get install -y nodejs && apt-get install -y nodejs
COPY . /src COPY . /src
@ -15,10 +15,10 @@ COPY . /src
WORKDIR /src WORKDIR /src
RUN cp -f misc/docker/config-patch.txt misc/release/config-patch.txt \ RUN cp -f misc/docker/config-patch.txt misc/release/config-patch.txt \
&& npm install \ && npm ci \
&& make ARCH_TARGETS=amd64 release && make ARCH_TARGETS=amd64 release
FROM busybox FROM reg.cadoles.com/proxy_cache/library/busybox
RUN adduser -D -h /app fsmtp RUN adduser -D -h /app fsmtp

11547
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -11,21 +11,21 @@
"author": "William Petit <wpetit@cadoles.com>", "author": "William Petit <wpetit@cadoles.com>",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"devDependencies": { "devDependencies": {
"@babel/core": "^7.2.0", "@babel/core": "^7.23.9",
"@babel/plugin-proposal-class-properties": "^7.2.1", "@babel/plugin-proposal-class-properties": "^7.2.1",
"@babel/preset-env": "^7.2.0", "@babel/preset-env": "^7.23.9",
"babel-loader": "^8.0.4", "babel-loader": "^9.1.3",
"bulma": "^0.8.2", "bulma": "^0.9.4",
"bulma-switch": "^2.0.0", "bulma-switch": "^2.0.4",
"css-loader": "^3.5.2", "css-loader": "^6.10.0",
"file-loader": "^6.0.0", "file-loader": "^6.2.0",
"mini-css-extract-plugin": "^0.9.0", "mini-css-extract-plugin": "^2.8.0",
"node-sass": "^4.14.1", "node-sass": "^9.0.0",
"resolve-url-loader": "^3.0.0", "resolve-url-loader": "^5.0.0",
"sass-loader": "^8.0.2", "sass-loader": "^14.1.1",
"stimulus": "^1.1.0", "stimulus": "^3.2.2",
"style-loader": "^1.1.4", "style-loader": "^3.3.4",
"webpack": "^4.25.0", "webpack": "^5.90.3",
"webpack-cli": "^3.1.2" "webpack-cli": "^5.1.4"
} }
} }

View File

@ -64,8 +64,8 @@ module.exports = {
}, },
plugins: [ plugins: [
new MiniCssExtractPlugin({ new MiniCssExtractPlugin({
filename: "/css/[name].css", filename: "./css/[name].css",
chunkFilename: "/css/[id].css" chunkFilename: "./css/[id].css"
}) })
] ]
} }