issue #210 chore: setting github action env

teamWaggle · Apr 15, 2024 · aa19322 · aa19322
1 parent 21ec279
commit aa19322
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 100 deletions.
diff --git a/.github/workflows/waggle-service-deploy.yml b/.github/workflows/waggle-service-deploy.yml
@@ -13,16 +13,15 @@ jobs:
         - name: Create ./packages/waggle-service/.env file
           run: |
             touch .env
-            echo "${{ secrets.VITE_BASE_URL }}" >> ./packages/waggle-service/.env
-            echo "${{ secrets.VITE_GOOGLE_CLIENT_ID }}" >> ./packages/waggle-service/.env
-            echo "${{ secrets.VITE_GOOGLE_CLIENT_SECRET }}" >> ./packages/waggle-service/.env
-            echo "${{ secrets.VITE_GOOGLE_REDIRECT_URI }}" >> ./packages/waggle-service/.env
-            echo "${{ secrets.VITE_KAKAO_API_KEY }}" >> ./packages/waggle-service/.env
-            echo "${{ secrets.VITE_KAKAO_REDIRECT_URI }}" >> ./packages/waggle-service/.env
-            echo "${{ secrets.VITE_NAVER_CLIENT_ID }}" >> ./packages/waggle-service/.env
-            echo "${{ secrets.VITE_NAVER_CLIENT_SECRET }}" >> ./packages/waggle-service/.env
-            echo "${{ secrets.VITE_NAVER_REDIRECT_URI }}" >> ./packages/waggle-service/.env
-
+            echo "VITE_BASE_URL=${{ secrets.VITE_BASE_URL }}" >> ./packages/waggle-service/.env
+            echo "VITE_GOOGLE_CLIENT_ID=${{ secrets.VITE_GOOGLE_CLIENT_ID }}" >> ./packages/waggle-service/.env
+            echo "VITE_GOOGLE_CLIENT_SECRET=${{ secrets.VITE_GOOGLE_CLIENT_SECRET }}" >> ./packages/waggle-service/.env
+            echo "VITE_GOOGLE_REDIRECT_URI=${{ secrets.VITE_GOOGLE_REDIRECT_URI }}" >> ./packages/waggle-service/.env
+            echo "VITE_KAKAO_API_KEY=${{ secrets.VITE_KAKAO_API_KEY }}" >> ./packages/waggle-service/.env
+            echo "VITE_KAKAO_REDIRECT_URI=${{ secrets.VITE_KAKAO_REDIRECT_URI }}" >> ./packages/waggle-service/.env
+            echo "VITE_NAVER_CLIENT_ID=${{ secrets.VITE_NAVER_CLIENT_ID }}" >> ./packages/waggle-service/.env
+            echo "VITE_NAVER_CLIENT_SECRET=${{ secrets.VITE_NAVER_CLIENT_SECRET }}" >> ./packages/waggle-service/.env
+            echo "VITE_NAVER_REDIRECT_URI=${{ secrets.VITE_NAVER_REDIRECT_URI }}" >> ./packages/waggle-service/.env
         # - name: Get the version
         #   id: get_version
         #   run: |
@@ -32,22 +31,17 @@ jobs:
           uses: docker/setup-buildx-action@v3
 
         - name: Login to DockerHub
-          uses: docker/login-action@v3
+          uses: docker/login-action@v2
           with:
             username: ${{ secrets.DOCKER_USERNAME }}
             password: ${{ secrets.DOCKER_PASSWORD }}
         - name: Build and push
-          # uses: docker/build-push-action@v5
-          # with:
-          #   context: .
-          #   file: ./Dockerfile
-          #   platforms: linux/amd64
-          #   push: true
-          #   tags: /waggle-front-waggle-service
-          run: |
-            docker-compose build
-            docker tag ${{secrets.DOCKER_TAG_NAME}} ${{ secrets.DOCKER_USERNAME }}/${{secrets.DOCKER_TAG_NAME}}
-            docker push ${{ secrets.DOCKER_USERNAME }}/${{secrets.DOCKER_TAG_NAME}}
+          uses: docker/build-push-action@v5
+          with:
+            context: .
+            file: ./Dockerfile
+            push: true
+            tags: ${{ secrets.DOCKER_USERNAME }}/waggle-front-waggle-service
 
         - name: Deploy EC2
           uses: appleboy/ssh-action@master
@@ -59,5 +53,5 @@ jobs:
             script: |
               docker stop ${{secrets.DOCKER_CONTAINER_NAME}}
               docker rm ${{secrets.DOCKER_CONTAINER_NAME}}
-              docker pull ${{ secrets.DOCKER_USERNAME }}/${{secrets.DOCKER_TAG_NAME}}
-              docker run -d -p 3001:80 --name "${{secrets.DOCKER_CONTAINER_NAME}}" ${{ secrets.DOCKER_USERNAME }}/${{secrets.DOCKER_TAG_NAME}}
+              docker pull ${{ secrets.DOCKER_USERNAME }}/waggle-front-waggle-service
+              docker run -d -p 3001:80 --name "${{secrets.DOCKER_CONTAINER_NAME}}" ${{ secrets.DOCKER_USERNAME }}/waggle-front-waggle-service
diff --git a/Dockerfile b/Dockerfile
@@ -1,50 +1,3 @@
-# FROM  node:18-alpine AS builder
-
-
-
-# RUN npm install yarn --global --force
-
-# RUN yarn install --immutable --immutable-cache --check-cache
-
-# COPY . ./
-# RUN yarn build:waggle-service
-
-# FROM builder AS release
-
-
-
-# FROM  node:19.6.0-alpine
-
-# WORKDIR /app
-
-# COPY . .
-
-# RUN yarn install
-# COPY package* yarn.lock .pnp*     ./
-# COPY .yarnrc.yml                  ./
-# COPY .yarn                        ./.yarn
-
-# RUN yarn install --immutable --immutable-cache --check-cache
-
-# RUN yarn build:waggle-service
-
-# COPY --from=builder dist /packages/waggle-service/dist
-# COPY --from=builder .pnp.cjs /packages/waggle-service/.pnp.cjs
-# COPY --from=builder .yarnrc.yml /packages/waggle-service/.yarnrc.yml
-# COPY --from=builder .pnp.loader.mjs /packages/waggle-service/.pnp.loader.mjs
-
-# COPY --from=builder .yarn/cache /packages/waggle-service/.yarn/cache
-# COPY --from=builder .yarn/releases /packages/waggle-service/.yarn/releases
-# # COPY --from=builder .yarn/plugins /packages/waggle-service/.yarn/plugins
-# COPY --from=builder .yarn/sdks /packages/waggle-service/.yarn/sdks
-
-# # COPY --from=builder /usr/src/app/packages/waggle-service/dist /app/dist
-# # COPY --from=builder /usr/src/app/.pnp.cjs /app/.pnp.cjs
-# # COPY --from=builder /usr/src/app/.yarnrc.yml /app/.yarnrc.yml
-# # COPY --from=builder /usr/src/app/.yarn /app/.yarn
-# # COPY --from=builder /usr/src/app/package.json /app/package.json
-# # COPY --from=builder /usr/src/app/yarn.lock /app/yarn.lock
-
 FROM  node:19-alpine AS builder
 
 WORKDIR /usr/src/app
@@ -56,11 +9,8 @@ RUN yarn build:waggle-service
 
 FROM node:19-alpine AS Release
 
-
-
 WORKDIR /app
 
-
 COPY --from=builder /usr/src/app/packages/waggle-service/dist /app/packages/waggle-service/dist
 COPY --from=builder /usr/src/app/packages/waggle-service/package.json /app/packages/waggle-service/package.json
 COPY --from=builder /usr/src/app/.pnp.cjs /app/.pnp.cjs
@@ -70,8 +20,6 @@ COPY --from=builder /usr/src/app/package.json /app/package.json
 COPY --from=builder /usr/src/app/yarn.lock /app/yarn.lock
 RUN yarn install
 
-# CMD ["yarn", "preview:waggle-service"]
-
 FROM nginx:latest
 
 RUN rm /etc/nginx/conf.d/default.conf
@@ -82,19 +30,5 @@ RUN rm -rf ./usr/share/nginx/html/*
 
 COPY --from=Release /app/packages/waggle-service/dist ./usr/share/nginx/html/
 
-
 EXPOSE 3001
 ENTRYPOINT ["nginx", "-g", "daemon off;"]
-
-
-# FROM  node:19-alpine AS builder
-
-# WORKDIR /usr/src/app
-
-# COPY . .
-
-# RUN yarn install
-# # RUN yarn dev:waggle-service
-
-# CMD ["yarn", "dev:waggle-service"]
-# EXPOSE 5173
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -10,13 +10,3 @@ services:
     ports:
       - "3001:80"
     stdin_open: true
-
-  # nginx:
-  #   image: nginx:latest
-  #   build:
-  #     context: .
-  #     dockerfile: Dockerfile
-  #   ports:
-  #     - "80:80"
-  #   volumes:
-  #     - ./nginx/nginx.conf:/etc/nginx/nginx.conf