diff mbox series

[yocto-autobuilder2,2/3] docker: do not change shared and publish directory

Message ID 20251222-mathieu-fix-ptest-urls-v1-2-4153fdb174a8@bootlin.com
State New
Headers show
Series observer: Fix ptest link generation, again... | expand

Commit Message

Mathieu Dubois-Briand Dec. 22, 2025, 4:28 p.m. UTC 
We need to use the same public directory name as on the public
instance, so the log observers can match lines about yocto.io folders.
---
 docker/Dockerfile   | 5 +----
 docker/compose.yaml | 2 --
 docker/entry.sh     | 4 ++--
 3 files changed, 3 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/docker/Dockerfile b/docker/Dockerfile
index d291bce9a48c..3d6be54b0e47 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -110,14 +110,11 @@  RUN sed -i \
         -e "/^all_workers *=/s/workers_bringup + //" \
         # Switch from ssh:// URLS to git:// so we do not need any auth \
         -e "s#ssh://git@push\.\(yoctoproject.org\|openembedded.org\)/#git://git.\1/#" \
-        # Change location of sharedrepodir and publish_dest directories \
-        -e "s@^\(sharedrepodir *= *\).*@\1\"/sharedrepo\"@" \
-        -e "s@^\(publish_dest *= *\).*@\1\"/publish\"@" \
         # Use any worker for any release \
         -e '$ a workers_prev_releases = {}' \
         /home/pokybuild/yocto-controller/yoctoabb/config.py && \
     sed -i \
-        # Change location of sharedrepodir and publish_dest directories \
+        # Use git protocol instead of ssh
         -e "s#ssh://git@push\.\(yoctoproject.org\|openembedded.org\)/#git://git.\1/#" \
         /home/pokybuild/yocto-autobuilder-helper/config.json && \
     sed -i \
diff --git a/docker/compose.yaml b/docker/compose.yaml
index 23d09f4fe52c..97ea724b968f 100644
--- a/docker/compose.yaml
+++ b/docker/compose.yaml
@@ -8,8 +8,6 @@  x-base-service: &base-service
     context: ..
     dockerfile: docker/Dockerfile
   volumes:
-    - sharedrepo:/sharedrepo
-    - publish:/publish
     - mirror:/home/pokybuild/git/mirror
     - srvautobuilder:/srv/autobuilder
   stdin_open: true
diff --git a/docker/entry.sh b/docker/entry.sh
index fe4c4b5def25..125f447be4f2 100644
--- a/docker/entry.sh
+++ b/docker/entry.sh
@@ -2,8 +2,8 @@ 
 
 chmod 666 /dev/kvm
 
-chown pokybuild:nogroup /sharedrepo
-chown pokybuild:nogroup /publish
+chown pokybuild:nogroup /srv/autobuilder/repos
+chown pokybuild:nogroup /srv/autobuilder/autobuilder.yocto.io/pub
 chown pokybuild:nogroup /home/pokybuild/git/mirror
 chown pokybuild:nogroup /srv/autobuilder
 cd /home/pokybuild/ || exit 1