Skip to content

Commit

Permalink
switched to alpine 3.20, updated biome, made php 8.3 default
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Bley committed Jun 29, 2024
1 parent e9471fc commit 9d596e7
Show file tree
Hide file tree
Showing 19 changed files with 146 additions and 126 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
image: alpine:3.19
image: alpine:3.20

variables:
GIT_DEPTH: 1
Expand Down
12 changes: 10 additions & 2 deletions biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,16 @@
"nursery": {
"all": true,
"useImportRestrictions": "off",
"noNodejsModules": "off"
"noUndeclaredDependencies": "off",
"useTopLevelRegex": "off"
},
"suspicious": {
"all": true,
"noEmptyBlockStatements": "off"
},
"correctness": {
"all": true,
"noNodejsModules": "off"
}
}
},
Expand Down Expand Up @@ -50,7 +55,10 @@
},
"css": {
"formatter": {
"enabled": true
"enabled": false
},
"linter": {
"enabled": false
}
}
}
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
php:
build: ./docker/php82
build: ./docker/php83
image: example_tasks_php
cap_drop: [all]
volumes:
Expand Down
2 changes: 1 addition & 1 deletion docker/apib2html/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# see https://github.com/funbox/blueprinter

FROM alpine:3.19
FROM alpine:3.20

RUN apk upgrade --no-cache \
&& apk add --no-cache npm nodejs \
Expand Down
2 changes: 1 addition & 1 deletion docker/apib2openapi/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# see https://github.com/kminami/apib2swagger

FROM alpine:3.19
FROM alpine:3.20

RUN apk upgrade --no-cache \
&& apk add --no-cache npm nodejs \
Expand Down
2 changes: 1 addition & 1 deletion docker/chromium/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.19
FROM alpine:3.20

RUN apk --no-cache upgrade \
&& apk --no-cache add chromium-swiftshader \
Expand Down
2 changes: 1 addition & 1 deletion docker/mailpit/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.19
FROM alpine:3.20

RUN apk upgrade --no-cache \
&& ARCH=$([ $(uname -m) == "x86_64" ] && echo "amd64" || echo "arm64") \
Expand Down
4 changes: 2 additions & 2 deletions docker/nginx/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.19 as build
FROM alpine:3.20 as build

RUN apk upgrade --no-cache \
&& apk add --no-cache openssl \
Expand All @@ -10,7 +10,7 @@ RUN apk upgrade --no-cache \
-CAcreateserial \
-extfile <(printf "authorityKeyIdentifier=keyid,issuer\nbasicConstraints=CA:FALSE\nsubjectAltName=DNS:nginx,IP:127.0.0.1")

FROM alpine:3.19
FROM alpine:3.20

RUN apk upgrade --no-cache \
&& apk add --no-cache nginx \
Expand Down
2 changes: 1 addition & 1 deletion docker/npm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.19
FROM alpine:3.20

RUN apk upgrade --no-cache \
&& apk add --no-cache npm nodejs patch \
Expand Down
2 changes: 1 addition & 1 deletion docker/php81/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.19
FROM alpine:edge

# use 1 run command to reduce container image layers
RUN apk --no-cache upgrade \
Expand Down
2 changes: 1 addition & 1 deletion docker/php83/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.19
FROM alpine:edge

# use 1 run command to reduce container image layers
RUN apk --no-cache upgrade \
Expand Down
2 changes: 1 addition & 1 deletion docker/redis/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.19
FROM alpine:3.20

RUN apk upgrade --no-cache \
&& apk add --no-cache redis
Expand Down
12 changes: 10 additions & 2 deletions tasks_fe/biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,16 @@
"nursery": {
"all": true,
"useImportRestrictions": "off",
"noNodejsModules": "off"
"noUndeclaredDependencies": "off",
"useTopLevelRegex": "off"
},
"suspicious": {
"all": true,
"noEmptyBlockStatements": "off"
},
"correctness": {
"all": true,
"noNodejsModules": "off"
}
}
},
Expand Down Expand Up @@ -52,7 +57,10 @@
},
"css": {
"formatter": {
"enabled": true
"enabled": false
},
"linter": {
"enabled": false
}
}
}
2 changes: 1 addition & 1 deletion tasks_fe/src/templates/tasks_list.css
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
height: 32px;
}
}
a:link, a:visited {
a:visited, a:link {
color: inherit;
}
}
Expand Down
Loading

0 comments on commit 9d596e7

Please sign in to comment.