Skip to content

Commit c4d9570

Browse files
Podman support
1 parent faacc82 commit c4d9570

File tree

5 files changed

+22
-11
lines changed

5 files changed

+22
-11
lines changed

pkg/project.go

+2
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ func (p Project) scaffoldLocalEnvFile(kind project.Kind) error {
136136
propTrimmed := strings.TrimSpace(prop)
137137
if propTrimmed != "" {
138138
if err := filex.AppendString(osx.EnvLocalFile, osx.LineSep()+strings.Join([]string{
139+
"",
140+
"# AEM Application",
139141
"",
140142
"AEM_PACKAGE=" + prop,
141143
"",
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
services:
2+
dispatcher:
3+
container_name: dispatcher
4+
image: acme/aem-ams/dispatcher-publish:latest
5+
platform: linux/amd64
6+
ports:
7+
- "80:80"
8+
volumes:
9+
- ./home/docker/httpd/logs:/etc/httpd/logs
10+
- ./home/docker/httpd/cache:/var/www/cache
11+
sysctls:
12+
# Fixes: "Permission denied: AH00072: make_sock: could not bind to address [::]:80"
13+
# See: https://documentation.suse.com/smart/container/html/rootless-podman/index.html#rootless-podman-configure-port-below-1024
14+
net.ipv4.ip_unprivileged_port_start: 0

pkg/project/app_classic/dispatcher/docker-compose.yml

-10
This file was deleted.

pkg/project/app_classic/local.env

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ AEM_DISPATCHER_DOMAINS=${AEM_DISPATCHER_DOMAIN} author.aem.local
1818
# Docker/Podman switch
1919

2020
DOCKER_COMMAND=podman
21-
DOCKER_COMPOSE_COMMAND=podman-compose
21+
DOCKER_COMPOSE_COMMAND=podman compose
22+
PODMAN_COMPOSE_WARNING_LOGS=0

pkg/project/app_cloud/dispatcher/docker-compose.yml pkg/project/app_cloud/dispatcher/compose.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,7 @@ services:
2323
# Enable previewing logs and caches directly on host
2424
- ./home/sdk/logs:/var/log/apache2
2525
- ./home/sdk/cache:/mnt/var/www
26+
sysctls:
27+
# Fixes: "Permission denied: AH00072: make_sock: could not bind to address [::]:80"
28+
# See: https://documentation.suse.com/smart/container/html/rootless-podman/index.html#rootless-podman-configure-port-below-1024
29+
net.ipv4.ip_unprivileged_port_start: 0

0 commit comments

Comments
 (0)