@@ -13,7 +13,14 @@ begin_banner "project-m36" "deploy prepare"
1313if [ ! -L ${SCRIPT_ABS_PATH}/../../../../result ]; then
1414 warn "no project-m36 build result found, suppose that the image would be pull from registry"
1515else
16− sudo sg docker -c "docker load -i ${SCRIPT_ABS_PATH}/../../../../result"
16+ LOCAL_IMAGE_LOAD_RESULT=$(sudo sg docker -c "docker load -i ${SCRIPT_ABS_PATH}/../../../../result")
17+ LOCAL_IMAGE_TAG=$(echo ${LOCAL_IMAGE_LOAD_RESULT} | awk -F"image: " '{print $NF}')
18+ info "local image tag: ${LOCAL_IMAGE_TAG}"
19+ info "tagging the image as projectm36/${LOCAL_IMAGE_TAG}"
20+ sudo sg docker -c "docker tag ${LOCAL_IMAGE_TAG} projectm36/${LOCAL_IMAGE_TAG}"
21+ info "pushing the tag projectm36/${LOCAL_IMAGE_TAG} to docker.io hub"
22+ sudo sg docker -c "docker login -u \"${project_m36_DOCKER_HUB_USERNAME}\" -p \"${project_m36_DOCKER_HUB_PASSWORD}\""
23+ sudo sg docker -c "docker push projectm36/${LOCAL_IMAGE_TAG}"
1724fi
1825
1926set +e
@@ -43,13 +50,7 @@ sudo cp ${SCRIPT_ABS_PATH}/docker-compose.yml /var/project-m36/docker-compose-pr
4350sudo chown project-m36:project-m36 /var/project-m36/docker-compose-project-m36.yml.orig
4451
4552sudo sed "s:project-m36_config_path:/var/project-m36/config:g" < /var/project-m36/docker-compose-project-m36.yml.orig | sudo su -p -c "dd of=/var/project-m36/docker-compose-project-m36.yml.01" project-m36
46−sudo sed "s:project-m36_data_path:/var/project-m36/data:g" < /var/project-m36/docker-compose-project-m36.yml.01 | sudo su -p -c "dd of=/var/project-m36/docker-compose-project-m36.yml" project-m36
47−
48−# if [ -L ${SCRIPT_ABS_PATH}/../../../../result ]; then
49−# project-m36_IMAGE_ID=$(sudo sg docker -c "docker images"|grep -w project-m36|awk '{print $3}')
50−# cmdPath=$(sudo sg docker -c "docker image inspect ${project-m36_IMAGE_ID}" | grep "/nix/store/" | awk -F"/" '{print "/nix/store/"$4}')
51−# sudo sed "s:static_project-m36_nix_store_path:${cmdPath}:g" < /var/project-m36/docker-compose-project-m36.yml | sudo su -p -c "dd of=/var/project-m36/docker-compose-project-m36.yml.02" project-m36
52−# sudo cat /var/project-m36/docker-compose-project-m36.yml.02 | sudo su -p -c "dd of=/var/project-m36/docker-compose-project-m36.yml" project-m36
53−# fi
53+sudo sed "s:project-m36_data_path:/var/project-m36/data:g" < /var/project-m36/docker-compose-project-m36.yml.01 | sudo su -p -c "dd of=/var/project-m36/docker-compose-project-m36.yml.02" project-m36
54+sudo sed "s/DOCKER_HUB_IMAGE_TAG/projectm36\/${LOCAL_IMAGE_TAG}/g" < /var/project-m36/docker-compose-project-m36.yml.02 | sudo su -p -c "dd of=/var/project-m36/docker-compose-project-m36.yml" project-m36
5455
5556done_banner "project-m36" "deploy prepare"