diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 730a6be..862a99b 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -10,11 +10,11 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: - java-version: '11' - distribution: 'temurin' + java-version: '17' + distribution: 'adopt' - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 @@ -29,11 +29,8 @@ jobs: - name: web docker build and push run: | docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} - docker build -t ${{ secrets.DOCKER_REPO }}/mappin-server . - docker push ${{ secrets.DOCKER_REPO }}/mappin-server - - docker build -t ${{ secrets.DOCKER_REPO }}/mappin-nginx -f dockerfile-nginx . - docker push ${{ secrets.DOCKER_REPO }}/mappin-nginx + docker build -t ${{ secrets.DOCKER_REPO }}/meme-service . + docker push ${{ secrets.DOCKER_REPO }}/meme-service - name: Install Docker on EC2 uses: appleboy/ssh-action@v0.1.6 @@ -92,13 +89,7 @@ jobs: # Create .env file echo "DB_URL=${{ secrets.DB_URL }}" > ~/.env echo "DB_USERNAME=${{ secrets.DB_USERNAME }}" >> ~/.env - echo "DB_PASS=${{ secrets.DB_PASS }}" >> ~/.env - echo "JWT_SECRET=${{ secrets.JWT_SECRET }}" >> ~/.env - echo "KAKAO_CLIENT=${{ secrets.KAKAO_CLIENT }}" >> ~/.env - echo "KAKAO_SECRET=${{ secrets.KAKAO_SECRET }}" >> ~/.env - echo "KAKAO_REST_API_KEY=${{ secrets.KAKAO_REST_API_KEY }}" >> ~/.env - echo "S3ACCESSKEY=${{ secrets.S3ACCESSKEY }}" >> ~/.env - echo "S3SECRETKEY=${{ secrets.S3SECRETKEY }}" >> ~/.env + echo "DB_PASS=${{ secrets.DB_PASS }}" >> ~/.env # Copy .env file to the project directory #cp ~/.env /home/ubuntu/.env