summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Magorsch <arzano@gentoo.org>2020-03-03 04:47:49 +0100
committerMax Magorsch <arzano@gentoo.org>2020-03-03 04:47:49 +0100
commit6740f6fa208042e6986a81d6cf5d4006e41e43ec (patch)
tree696de349df8fcfaa826ba7773eced711c7a87d7d
parentFix the permissions during update (diff)
downloadplanet-6740f6fa208042e6986a81d6cf5d4006e41e43ec.tar.gz
planet-6740f6fa208042e6986a81d6cf5d4006e41e43ec.tar.bz2
planet-6740f6fa208042e6986a81d6cf5d4006e41e43ec.zip
Split the planet and container updatev2.0.4
The planet data and container image can be updated seperately now. The container image may not be updated as regular as the planet data. Signed-off-by: Max Magorsch <arzano@gentoo.org>
-rw-r--r--rebuild-container.sh8
-rwxr-xr-xupdate-planet.sh (renamed from update.sh)8
2 files changed, 10 insertions, 6 deletions
diff --git a/rebuild-container.sh b/rebuild-container.sh
new file mode 100644
index 00000000..56d7b55a
--- /dev/null
+++ b/rebuild-container.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+USER=${1:-gplanet}
+GROUP=${2:-gplanet}
+
+docker build --build-arg USER_ID=$(id -u $USER) \
+ --build-arg GROUP_ID=$(id -g $GROUP) \
+ -t gentoo/planet-pluto:latest .
diff --git a/update.sh b/update-planet.sh
index 8ca43c3f..7e4792f3 100755
--- a/update.sh
+++ b/update-planet.sh
@@ -1,15 +1,11 @@
#!/bin/sh
-USER=${1:gplanet}
-GROUP=${2:gplanet}
+USER=${1:-gplanet}
+GROUP=${2:-gplanet}
mkdir -p htdocs data
chown -R $USER:$GROUP htdocs data
-docker build --build-arg USER_ID=$(id -u $USER) \
- --build-arg GROUP_ID=$(id -g $GROUP) \
- -t gentoo/planet-pluto:latest .
-
docker run --privileged \
--mount type=bind,source="$(pwd)"/htdocs,target=/var/www/planet.gentoo.org/build \
--mount type=bind,source="$(pwd)"/data,target=/var/www/planet.gentoo.org/data \