Skip to content

Commit f384e08

Browse files
committed
update portainer and gitea
1 parent bae0b98 commit f384e08

2 files changed

Lines changed: 23 additions & 1 deletion

File tree

docker/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ services:
2626
- /data/compose:/data/compose
2727
- /var/run/docker.sock:/var/run/docker.sock
2828
#- /run/podman/podman.sock:/var/run/docker.sock
29-
command: ["--hide-label", "owner=websoft9"]
29+
command: ["--hide-label", "owner=websoft9", "--no-csp"]
3030
labels:
3131
- "owner=websoft9"
3232
- "com.docker.compose.w9_http.port=9000"

install/install_docker.sh

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,31 @@ command_exists() {
211211
command -v "$@" > /dev/null 2>&1
212212
}
213213

214+
# Configure Docker service with custom environment variables
215+
configure_docker_service() {
216+
echo "[Websoft9] - Configuring Docker service with custom environment variables"
217+
218+
# Create systemd drop-in directory
219+
sudo mkdir -p /etc/systemd/system/docker.service.d
220+
221+
# Create configuration file with custom environment variable
222+
sudo tee /etc/systemd/system/docker.service.d/custom-environment.conf <<-'EOF'
223+
[Service]
224+
Environment=DOCKER_MIN_API_VERSION=1.24
225+
EOF
226+
227+
# Reload systemd and restart Docker service
228+
sudo systemctl daemon-reload
229+
sudo systemctl restart docker
230+
231+
echo "[Websoft9] - Docker service configured with DOCKER_MIN_API_VERSION=1.24"
232+
}
214233

215234
# download docker install script
216235
download_docker_script
217236

218237
# install docker
219238
install_docker_official
239+
240+
# configure docker service
241+
configure_docker_service

0 commit comments

Comments
 (0)