@@ -17,17 +17,20 @@ jobs:
1717 - name : Checkout code
1818 uses : actions/checkout@v4
1919
20+ - name : Install jq
21+ run : sudo apt-get install -y jq
22+
2023 - name : Verify Portfolio Version
2124 run : |
22- current_version=$(cat ./portfolio/VERSION | tr -d '\n\r' )
25+ current_version=$(jq -r '.version' ./portfolio/package.json )
2326 previous_version=$(docker image ls --filter "reference=***/web-portfolio" --format "{{.Repository}}:{{.Tag}}" | awk -F ':' '{print $2}')
24- if [[ $current_version = $previous_version ]]; then echo 'Update semantic version in VERSION file'; exit 1; fi
27+ if [[ $current_version = $previous_version ]]; then echo 'Update semantic version in the package.json file'; exit 1; fi
2528
2629 - name : Verify Mail Server Version
2730 run : |
28- current_version=$(cat . /mail-server/VERSION | tr -d '\n\r' )
31+ current_version=$(jq -r '.version' . /mail-server/package.json )
2932 previous_version=$(docker image ls --filter "reference=***/mail-server" --format "{{.Repository}}:{{.Tag}}" | awk -F ':' '{print $2}')
30- if [[ $current_version = $previous_version ]]; then echo 'Update semantic version in VERSION file'; exit 1; fi
33+ if [[ $current_version = $previous_version ]]; then echo 'Update semantic version in the package.json file'; exit 1; fi
3134
3235 validate-docker-compose :
3336 name : Validate Docker Compose Files
8083 - name : Checkout code
8184 uses : actions/checkout@v4
8285
86+ - name : Install jq
87+ run : sudo apt-get install -y jq
88+
8389 - name : Set up Docker Buildx
8490 uses : docker/setup-buildx-action@v3
8591
@@ -91,17 +97,17 @@ jobs:
9197
9298 - name : Build Docker Image
9399 run : |
94- portfolio_version=$(cat ./portfolio/VERSION | tr -d '\n\r' )
100+ portfolio_version=$(jq -r '.version' ./portfolio/package.json )
95101 previous_version=$(docker image ls --filter "reference=${{ secrets.DOCKER_USERNAME }}/web-portfolio" --format "{{.Repository}}:{{.Tag}}" | awk -F ':' '{print $2}')
96- if [[ $portfolio_version -eq $previous_version ]]; then echo 'Update semantic version in VERSION file'; exit 1; fi
102+ if [[ $portfolio_version -eq $previous_version ]]; then echo 'Update semantic version in the package.json file'; exit 1; fi
97103
98104 docker build -f ./portfolio/Dockerfile -t ${{ secrets.DOCKER_USERNAME }}/web-portfolio:$portfolio_version -t ${{ secrets.DOCKER_USERNAME }}/web-portfolio:latest ./portfolio
99105 docker save --output portfolio-versioned.docker ${{ secrets.DOCKER_USERNAME }}/web-portfolio:$portfolio_version
100106 docker save --output portfolio-latest.docker ${{ secrets.DOCKER_USERNAME }}/web-portfolio:latest
101107
102- mail_server_version=$(cat . /mail-server/VERSION )
108+ mail_server_version=$(jq -r '.version' . /mail-server/package.json )
103109 previous_version=$(docker image ls --filter "reference=${{ secrets.DOCKER_USERNAME }}/web-portfolio" --format "{{.Repository}}:{{.Tag}}" | awk -F ':' '{print $2}')
104- if [[ $mail_server_version -eq $previous_version ]]; then echo 'Update semantic version in VERSION file'; exit 1; fi
110+ if [[ $mail_server_version -eq $previous_version ]]; then echo 'Update semantic version in the package.json file'; exit 1; fi
105111
106112 docker build -f ./mail-server/Dockerfile -t ${{ secrets.DOCKER_USERNAME }}/mail-server:$mail_server_version -t ${{ secrets.DOCKER_USERNAME }}/mail-server:latest ./mail-server
107113 docker save --output mail-server-versioned.docker ${{ secrets.DOCKER_USERNAME }}/mail-server:$mail_server_version
@@ -151,11 +157,11 @@ jobs:
151157 docker load --input ./mail-server-versioned.docker
152158 docker load --input ./mail-server-latest.docker
153159
154- portfolio_version =$(cat ./portfolio/VERSION | tr -d '\n\r' )
160+ mail_server_version =$(jq -r '.version' ./portfolio/package.json )
155161 docker push ${{ secrets.DOCKER_USERNAME }}/web-portfolio:$portfolio_version
156162 docker push ${{ secrets.DOCKER_USERNAME }}/web-portfolio:latest
157163
158- mail_server_version=$(cat . /mail-server/VERSION | tr -d '\n\r' )
164+ mail_server_version=$(jq -r '.version' . /mail-server/package.json )
159165 docker push ${{ secrets.DOCKER_USERNAME }}/mail-server:$mail_server_version
160166 docker push ${{ secrets.DOCKER_USERNAME }}/mail-server:latest
161167
0 commit comments