Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
seungwonme committed Aug 30, 2024
1 parent f41f998 commit b30b738
Show file tree
Hide file tree
Showing 51 changed files with 99 additions and 38 deletions.
36 changes: 36 additions & 0 deletions .gitmessage
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# commit message template
##################
# git config --local commit.template .gitmessage
# git config --local --unset commit.template
# Body와 Footer는 선택사항입니다.
##################
# Type: Subject

# Body

# Footer
########Type########
# feat: 새로운 기능 추가
# fix: 버그 수정
# refactor: 코드 리팩토링
# chore: 빌드 업무 수정, 패키지 매니저 수정, production code와 무관한 부분들 (.gitignore, build.gradle 같은)
# test: 테스트 코드, 리팩토링 테스트 코드 추가
########Subj########
# 영어로 Subject 작성 시
# Add: 추가
# Remove: 삭제
# Simplify: 단순화
# Update: 보완
# Implement: 구현
# Prevent: 방지
# Move: 이동
# Rename: 이름 변경
####################
# 예시
# feat: Implement JWT

# 로그인 시 JWT 발급

# Resolves: #111
# Ref: #122
# related to: #30, #50
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Docker Practice

[Dockerfile reference | Docker Docs](https://docs.docker.com/reference/dockerfile/)

```bash
docker run -it node:21.7-alpine3.18
```
Expand All @@ -20,3 +22,4 @@ RUN npm install
EXPOSE 80
# 마지막 명령 전에 로컬 머신과 연결할 포트를 지정한다.
# Documentation 목적으로 사용되며, 실제로 포트를 연결하려면 docker run -p(publish) 80:80 my-first-docker 명령어를 사용한다.
```
5 changes: 5 additions & 0 deletions docker/05_Network/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[Docker Container Network Bridge Explanation](https://jangseongwoo.github.io/docker/docker_container_network/)
[Docker Network Basics](https://itbhome.tistory.com/47)
[Standalone Container Networking](https://docs.docker.com/network/network-tutorial-standalone/)
[Bridge network driver](https://docs.docker.com/network/drivers/bridge/)
[Docker Bridge Network](https://medium.com/@augustineozor/understanding-docker-bridge-network-6e499da50f65)
1 change: 1 addition & 0 deletions docker/06_Volume/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[05. Docker 볼륨](https://captcha.tistory.com/69)
Empty file.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
- [Dockerfile](https://adjh54.tistory.com/414)
- [docker-compose: difference between networks and links - Stack Overflow](https://stackoverflow.com/questions/41294305/docker-compose-difference-between-networks-and-links)
- [Docker Volume Tutorial](https://seosh817.tistory.com/374)
- [WordPress Installation Guide](https://techplay.blog/%EC%9A%B0%EB%B6%84%ED%88%AC%EC%97%90%EC%84%9C-%EC%9B%8C%EB%93%9C%ED%94%84%EB%A0%88%EC%8A%A4wordpress%EB%A5%BC-%EC%84%A4%EC%B9%98%ED%95%98%EB%8A%94-%EB%B0%A9%EB%B2%95-lemp/)

Docker 볼륨 내의 컨텐츠를 확인하는 방법 중 하나는 Docker 컨테이너를 사용하여 해당 볼륨을 마운트하고, 그 내부를 탐색하는 것입니다. 위에서 제공된 출력을 바탕으로, `srcs_dbdata` 볼륨 안의 컨텐츠를 확인하는 방법을 설명하겠습니다.

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@ services:
# .env 파일에 정의된 것 외에 추가 환경 변수를 추가
environment:
- MYSQL_DATABASE=$MYSQL_DATABASE
# dbdata라는 명명된 볼륨을 /var/lib/mysql 디렉토리에 마운트
ports:
expose:
- "3306"
# dbdata라는 명명된 볼륨을 /var/lib/mysql 디렉토리에 마운트
volumes:
- dbdata:/var/lib/mysql
# 이미지에 대한 기본 CMD 지침을 재정의
# command: "--default-authentication-plugin=mysql_native_password"
networks:
- app-network
wordpress:
Expand All @@ -34,7 +32,7 @@ services:
- WORDPRESS_DB_USER=$MYSQL_USER
- WORDPRESS_DB_PASSWORD=$MYSQL_PASSWORD
- WORDPRESS_DB_NAME=$MYSQL_DATABASE
ports:
expose:
- "9000"
volumes:
- wordpress:/var/www/html
Expand Down
Empty file.
Empty file.
Empty file.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
14 changes: 14 additions & 0 deletions docker/projects/php/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
FROM alpine:latest

RUN apk update && \
apk add --no-cache openrc php php-fpm php-mbstring &&\
mkdir -p /var/www/html/

WORKDIR /var/www/html

COPY index.php .

EXPOSE 8000

CMD ["php", "-S", "0.0.0.0:8000", "-t", "/var/www/html"]

4 changes: 4 additions & 0 deletions docker/projects/php/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[Apache - Alpine Linux](https://wiki.alpinelinux.org/wiki/Apache)
[PHP 실행환경 만들기 및 간단 예제 실행](https://velog.io/@tkddnwkdb/PHP-%EC%8B%A4%ED%96%89%ED%99%98%EA%B2%BD-%EB%A7%8C%EB%93%A4%EA%B8%B0)

`dr -p 8080:80 -it php sh`
3 changes: 3 additions & 0 deletions docker/projects/php/index.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?php
echo 'Hello, PHP on Alpine Docker!';
?>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
28 changes: 28 additions & 0 deletions git/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Git

[Git Reference](https://git-scm.com/docs)

`git help`, `man git`, `git <command> --help` 명령어를 통해 각 명령어의 사용법을 확인할 수 있다.

## Git Command Workflow

![](../img/GitWorkflow.png)

## Git Branch

### Git Branch Model
- [{Git,Github,Gitlab} Flow 1](https://ujuc.github.io/2015/12/16/git-flow-github-flow-gitlab-flow/)
- [{Git,Github,Gitlab} Flow 2](https://wiki.yowu.dev/ko/dev/Git/about-git-github-gitlab-flow)
- [Trunk Based Development](https://trunkbaseddevelopment.com)
- [Trunk Based Development 기술 블로그](https://tech.mfort.co.kr/blog/2022-08-05-trunk-based-development/)

### Git Branch Policy
- [Branch Protection Rule](https://docs.github.com/ko/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/managing-a-branch-protection-rule)
- [CODEOWNERS file](https://docs.github.com/ko/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners)

## Git Command

[Git - Reference](https://git-scm.com/docs)

## .gitignore
[github/gitignore: A collection of useful .gitignore templates](https://github.com/github/gitignore)
34 changes: 1 addition & 33 deletions github/README.md
Original file line number Diff line number Diff line change
@@ -1,35 +1,3 @@
# Git

[Git Reference](https://git-scm.com/docs)

`git help`, `man git`, `git <command> --help` 명령어를 통해 각 명령어의 사용법을 확인할 수 있다.

## Git Command Workflow

![](../img/GitWorkflow.png)

## Git Branch

### Git Branch Model
- [{Git,Github,Gitlab} Flow 1](https://ujuc.github.io/2015/12/16/git-flow-github-flow-gitlab-flow/)
- [{Git,Github,Gitlab} Flow 2](https://wiki.yowu.dev/ko/dev/Git/about-git-github-gitlab-flow)
- [Trunk Based Development](https://trunkbaseddevelopment.com)
- [Trunk Based Development 기술 블로그](https://tech.mfort.co.kr/blog/2022-08-05-trunk-based-development/)

### Git Branch Policy
- [Branch Protection Rule](https://docs.github.com/ko/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/managing-a-branch-protection-rule)
- [CODEOWNERS file](https://docs.github.com/ko/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners)

## Git Command

### restore
- `git restore <modified file>` : 파일을 수정하기 전 상태로 되돌린다.
- `git restore --staged <file>` : 스테이징된 파일을 언스테이징한다.
- `git restore --source=<hash> <file>` : 특정 커밋의 파일을 수정하기 전 상태로 되돌린다.

### fetch
- `git fetch` : 원격 저장소의 변경사항을 로컬 저장소로 가져온다.

# Github

## Github Pages
[Github로 프로젝트 관리하기](https://github.com/cheese10yun/github-project-management)

0 comments on commit b30b738

Please sign in to comment.