Skip to content

Commit

Permalink
Merge pull request #6 from Google-DSC-Kookmin/master
Browse files Browse the repository at this point in the history
update for feature branch
  • Loading branch information
donggook-me committed Sep 24, 2023
2 parents 2dcb40e + 0d554b0 commit f85f95b
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 1 deletion.
23 changes: 23 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Docker Build and Push

on:
push:
branches:
- master

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Login to Docker Hub
run: docker login -u ${{ secrets.DOCKER_ID }} -p ${{ secrets.DOCKERHUB_ACCESSTOKEN }}

- name: Build Docker image
run: docker build -t crawlapp:latest .

- name: Push Docker image
run: docker push crawlapp:latest
5 changes: 5 additions & 0 deletions gitPrincipal.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
1. master 브랜치는 최종 배포용이다.
2. 새로운 기능 추가시 feature 브랜치로 checkout 해서 작업한다.
3. feature 브랜치에서 작업이 끝나면 리드에게 development 브랜치로 merging request 한다.
4. 리드가 확인 후 development 브랜치에 새로운 기능을 병합한다.
5. 신규 기능들이 모두 병합되고 정상 작동될시 master 브랜치로 합치고, 배포한다.
6 changes: 5 additions & 1 deletion install.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,8 @@ brew install tesseract
On Linux (Ubuntu/Debian):
sudo apt-get install tesseract-ocr


test for github Actions
second test
third test
fourth test
fifth test

0 comments on commit f85f95b

Please sign in to comment.