diff --git a/Makefile b/Makefile index fdcaf7b..ed10c4f 100644 --- a/Makefile +++ b/Makefile @@ -1,31 +1,37 @@ +DOCKER_HOST="playground.pi" +SITE_URL="beta.saai.digital" +PROJECT_NAME="web-wordpress-kit" +CONTAINER_NAME_WORDPRESS="${PROJECT_NAME}_wordpress" +CONTAINER_NAME_DB="${PROJECT_NAME}_db" +LISTENING_PORT=8080 + docker_deploy: 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 \ + -v $(shell pwd)/kit:/docker/volumes/${CONTAINER_NAME_WORDPRESS}/_data/wp-content/themes/kit \ alpine:edge tar cpfz /backup/volumes.tgz /docker/volumes/ - rsync --progress /tmp/backup/volumes.tgz playground.pi:/tmp/ + rsync --progress /tmp/backup/volumes.tgz ${DOCKER_HOST}:/tmp/ - -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://${DOCKER_HOST}" docker stop ${CONTAINER_NAME_WORDPRESS}_1 ${CONTAINER_NAME_DB}_1 + -DOCKER_HOST="ssh://${DOCKER_HOST}" docker rm ${CONTAINER_NAME_WORDPRESS}_1 ${CONTAINER_NAME_DB}_1 + -DOCKER_HOST="ssh://${DOCKER_HOST}" docker volume rm ${CONTAINER_NAME_WORDPRESS} ${CONTAINER_NAME_DB} - DOCKER_HOST="ssh://playground.pi" docker run --rm -it \ + DOCKER_HOST="ssh://${DOCKER_HOST}" docker run --rm -it \ -v /var/lib/docker:/docker \ -v /tmp:/volume-backup \ alpine:edge tar --strip-components=2 -xpvf /volume-backup/volumes.tgz -C /docker/volumes/ - DOCKER_HOST="ssh://playground.pi" docker run --rm -it \ + DOCKER_HOST="ssh://${DOCKER_HOST}" docker run --rm -it \ -v /var/lib/docker:/docker \ -v /tmp:/volume-backup \ - alpine:edge sed -i 81idefine\\\(\\\'WP_SITEURL\\\',\\\'https://beta.saai.digital\\\'\\\)\\\;\\ndefine\\\(\\\'WP_HOME\\\',\\\'https://beta.saai.digital\\\'\\\)\\\; /docker/volumes/web-wordpress-kit_wordpress/_data/wp-config.php + alpine:edge sed -i 81idefine\\\(\\\'WP_SITEURL\\\',\\\'https://${SITE_URL}\\\'\\\)\\\;\\ndefine\\\(\\\'WP_HOME\\\',\\\'https://${SITE_URL}\\\'\\\)\\\; /docker/volumes/${CONTAINER_NAME_WORDPRESS}/_data/wp-config.php # # 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_HOST="ssh://${DOCKER_HOST}" docker-compose -p ${PROJECT_NAME} -f /tmp/wordpress.yml create + DOCKER_HOST="ssh://${DOCKER_HOST}" docker-compose -p ${PROJECT_NAME} -f /tmp/wordpress.yml start docker_up: docker-compose -f wordpress.yml up diff --git a/kit/css/header.css b/kit/css/header.css index 8d29c2a..eafb608 100644 --- a/kit/css/header.css +++ b/kit/css/header.css @@ -71,7 +71,6 @@ header:not(.sticky-header) .header-button-container { .header-logo { display: block; - width: 10rem; height: 4.61111rem; } @@ -81,7 +80,6 @@ header:not(.sticky-header) .header-button-container { .header-logo-mobile { display: none; - width: 6.11111rem; height: 2.77778rem; }