From 4eb19a4945e2c3fae9f0789f12428a6596c9a9bb Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sat, 11 Apr 2020 11:40:53 +0200 Subject: [PATCH] finished remote deploy script --- Makefile | 29 ++++++++++++++++++++++++++--- README.md | 6 ++---- kit/css/footer.css | 5 +++-- kit/header.php | 3 --- kit/template-parts/footer-nav.php | 5 +++-- 5 files changed, 34 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 6fbe72d..73a53b7 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,30 @@ docker_deploy: - # Need to fix MaxSessions in remote ssh daemon https://github.com/docker/compose/issues/6463 - # Disable nftables on remote host - DOCKER_HOST="ssh://playground.pi" docker-compose -f wordpress.yml up + + docker run --rm -it \ + -v /tmp/backup:/backup -v /var/lib/docker:/docker \ + -v $(shell pwd)/kit:/docker/volumes/web-wordpress-kit_wordpress/_data/wp-content/themes/kit \ + alpine:edge tar cfz /backup/volumes.tgz /docker/volumes/ + rsync --progress /tmp/backup/volumes.tgz playground.pi:/tmp/ + + ssh playground.pi tar xvf /tmp/volumes.tgz -C /tmp + + ssh playground.pi sed -i 81idefine\\\(\\\'WP_SITEURL\\\',\\\'https://beta.saai.digital\\\'\\\)\\\;\\\\ndefine\\\(\\\'WP_HOME\\\',\\\'https://beta.saai.digital\\\'\\\)\\\; /tmp/docker/volumes/web-wordpress-kit_wordpress/_data/wp-config.php + + -DOCKER_HOST="ssh://playground.pi" docker stop web-wordpress-kit_db_1 web-wordpress-kit_wordpress_1 + -DOCKER_HOST="ssh://playground.pi" docker rm web-wordpress-kit_db_1 web-wordpress-kit_wordpress_1 + -DOCKER_HOST="ssh://playground.pi" docker volume rm web-wordpress-kit_db web-wordpress-kit_wordpress + + DOCKER_HOST="ssh://playground.pi" docker run --rm -it \ + -v /var/lib/docker:/docker \ + -v /tmp/docker/volumes:/volume-backup \ + alpine:edge cp -r /volume-backup/. /docker/volumes/ + # # Need to fix MaxSessions in remote ssh daemon https://github.com/docker/compose/issues/6463 + # # Disable nftables on remote host + + cp wordpress.yml /tmp/wordpress.yml + sed -e '/kit/ s/^#*/#/' -i /tmp/wordpress.yml + DOCKER_HOST="ssh://playground.pi" docker-compose -p web-wordpress-kit -f /tmp/wordpress.yml create + DOCKER_HOST="ssh://playground.pi" docker-compose -p web-wordpress-kit -f /tmp/wordpress.yml start docker_up: docker-compose -f wordpress.yml up diff --git a/README.md b/README.md index eac4861..820585d 100644 --- a/README.md +++ b/README.md @@ -5,10 +5,8 @@ Fork of the experimental KIT theme from kit-ausbildung.de, adapted to Wordpres. ## Features -- [x] Browse hundreds of radio stations world wide and play them directly -- [x] Save stations to your favorites list -- [x] Smooth playback with audio transitions -- [x] Explore new stations in the category section +- [x] Responsive interface, mobile friendly +- [ ] Support for internationalization ## Maintainers * [Jonas Heinrich](https://git.scc.kit.edu/ubezi) diff --git a/kit/css/footer.css b/kit/css/footer.css index 404d3da..a7e8a4f 100644 --- a/kit/css/footer.css +++ b/kit/css/footer.css @@ -49,14 +49,14 @@ } .meta-footer-contact-entity .phone::before { - content: url(img/phone-grey.svg); + content: url(../img/phone-grey.svg); top: 0; width: 0.94444rem; height: 1.11111rem; } .meta-footer-contact-entity .email::before { - content: url(img/mail-grey.svg); + content: url(../img/mail-grey.svg); top: -2px; width: 1.11111rem; height: 0.77778rem; @@ -310,6 +310,7 @@ .footer-bottom .content-wrap { height: 100%; + display: flex; } .footer-bottom .content-wrap ul { diff --git a/kit/header.php b/kit/header.php index 4638833..02cb97e 100644 --- a/kit/header.php +++ b/kit/header.php @@ -88,9 +88,6 @@ - - -
diff --git a/kit/template-parts/footer-nav.php b/kit/template-parts/footer-nav.php index ca638c4..7ea80d0 100644 --- a/kit/template-parts/footer-nav.php +++ b/kit/template-parts/footer-nav.php @@ -6,7 +6,8 @@ 'container' => 'false' ) ); ?> - - lol +
+
+