diff --git a/.gitmessage b/.gitmessage new file mode 100644 index 0000000..c8d71be --- /dev/null +++ b/.gitmessage @@ -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 diff --git a/docker/inception/srcs/requirements/mariadb/.dockerignore b/docker/01_Docker/README.md similarity index 100% rename from docker/inception/srcs/requirements/mariadb/.dockerignore rename to docker/01_Docker/README.md diff --git a/docker/inception/srcs/requirements/nginx/.dockerignore b/docker/02_Container/README.md similarity index 100% rename from docker/inception/srcs/requirements/nginx/.dockerignore rename to docker/02_Container/README.md diff --git a/docker/inception/srcs/requirements/wordpress/.dockerignore b/docker/03_Image/README.md similarity index 100% rename from docker/inception/srcs/requirements/wordpress/.dockerignore rename to docker/03_Image/README.md diff --git a/docker/dockerfile/README.md b/docker/04_Dockerfile/README.md similarity index 88% rename from docker/dockerfile/README.md rename to docker/04_Dockerfile/README.md index aeb7df6..fcc760a 100644 --- a/docker/dockerfile/README.md +++ b/docker/04_Dockerfile/README.md @@ -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 ``` @@ -20,3 +22,4 @@ RUN npm install EXPOSE 80 # 마지막 명령 전에 로컬 머신과 연결할 포트를 지정한다. # Documentation 목적으로 사용되며, 실제로 포트를 연결하려면 docker run -p(publish) 80:80 my-first-docker 명령어를 사용한다. +``` diff --git a/docker/05_Network/README.md b/docker/05_Network/README.md new file mode 100644 index 0000000..3e4ae9a --- /dev/null +++ b/docker/05_Network/README.md @@ -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) diff --git a/docker/06_Volume/README.md b/docker/06_Volume/README.md new file mode 100644 index 0000000..4dfd9ed --- /dev/null +++ b/docker/06_Volume/README.md @@ -0,0 +1 @@ +[05. Docker 볼륨](https://captcha.tistory.com/69) diff --git a/docker/07_Docker-Compose/README.md b/docker/07_Docker-Compose/README.md new file mode 100644 index 0000000..e69de29 diff --git a/docker/inception/Makefile b/docker/projects/inception/Makefile similarity index 100% rename from docker/inception/Makefile rename to docker/projects/inception/Makefile diff --git a/docker/inception/README.md b/docker/projects/inception/README.md similarity index 94% rename from docker/inception/README.md rename to docker/projects/inception/README.md index 49eb98e..87d7d1a 100644 --- a/docker/inception/README.md +++ b/docker/projects/inception/README.md @@ -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` 볼륨 안의 컨텐츠를 확인하는 방법을 설명하겠습니다. diff --git a/docker/inception/srcs/.env b/docker/projects/inception/srcs/.env similarity index 100% rename from docker/inception/srcs/.env rename to docker/projects/inception/srcs/.env diff --git a/docker/inception/srcs/docker-compose.yml b/docker/projects/inception/srcs/docker-compose.yml similarity index 91% rename from docker/inception/srcs/docker-compose.yml rename to docker/projects/inception/srcs/docker-compose.yml index 8ba90a7..dfacd81 100644 --- a/docker/inception/srcs/docker-compose.yml +++ b/docker/projects/inception/srcs/docker-compose.yml @@ -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: @@ -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 diff --git a/docker/projects/inception/srcs/requirements/mariadb/.dockerignore b/docker/projects/inception/srcs/requirements/mariadb/.dockerignore new file mode 100644 index 0000000..e69de29 diff --git a/docker/inception/srcs/requirements/mariadb/Dockerfile b/docker/projects/inception/srcs/requirements/mariadb/Dockerfile similarity index 100% rename from docker/inception/srcs/requirements/mariadb/Dockerfile rename to docker/projects/inception/srcs/requirements/mariadb/Dockerfile diff --git a/docker/inception/srcs/requirements/mariadb/README.md b/docker/projects/inception/srcs/requirements/mariadb/README.md similarity index 100% rename from docker/inception/srcs/requirements/mariadb/README.md rename to docker/projects/inception/srcs/requirements/mariadb/README.md diff --git a/docker/inception/srcs/requirements/mariadb/conf/mariadb-server.cnf b/docker/projects/inception/srcs/requirements/mariadb/conf/mariadb-server.cnf similarity index 100% rename from docker/inception/srcs/requirements/mariadb/conf/mariadb-server.cnf rename to docker/projects/inception/srcs/requirements/mariadb/conf/mariadb-server.cnf diff --git a/docker/inception/srcs/requirements/mariadb/tools/run.sh b/docker/projects/inception/srcs/requirements/mariadb/tools/run.sh similarity index 100% rename from docker/inception/srcs/requirements/mariadb/tools/run.sh rename to docker/projects/inception/srcs/requirements/mariadb/tools/run.sh diff --git a/docker/projects/inception/srcs/requirements/nginx/.dockerignore b/docker/projects/inception/srcs/requirements/nginx/.dockerignore new file mode 100644 index 0000000..e69de29 diff --git a/docker/inception/srcs/requirements/nginx/Dockerfile b/docker/projects/inception/srcs/requirements/nginx/Dockerfile similarity index 100% rename from docker/inception/srcs/requirements/nginx/Dockerfile rename to docker/projects/inception/srcs/requirements/nginx/Dockerfile diff --git a/docker/inception/srcs/requirements/nginx/README.md b/docker/projects/inception/srcs/requirements/nginx/README.md similarity index 100% rename from docker/inception/srcs/requirements/nginx/README.md rename to docker/projects/inception/srcs/requirements/nginx/README.md diff --git a/docker/inception/srcs/requirements/nginx/conf/default.conf b/docker/projects/inception/srcs/requirements/nginx/conf/default.conf similarity index 100% rename from docker/inception/srcs/requirements/nginx/conf/default.conf rename to docker/projects/inception/srcs/requirements/nginx/conf/default.conf diff --git a/docker/projects/inception/srcs/requirements/wordpress/.dockerignore b/docker/projects/inception/srcs/requirements/wordpress/.dockerignore new file mode 100644 index 0000000..e69de29 diff --git a/docker/inception/srcs/requirements/wordpress/Dockerfile b/docker/projects/inception/srcs/requirements/wordpress/Dockerfile similarity index 100% rename from docker/inception/srcs/requirements/wordpress/Dockerfile rename to docker/projects/inception/srcs/requirements/wordpress/Dockerfile diff --git a/docker/inception/srcs/requirements/wordpress/README.md b/docker/projects/inception/srcs/requirements/wordpress/README.md similarity index 100% rename from docker/inception/srcs/requirements/wordpress/README.md rename to docker/projects/inception/srcs/requirements/wordpress/README.md diff --git a/docker/inception/srcs/requirements/wordpress/conf/php.ini b/docker/projects/inception/srcs/requirements/wordpress/conf/php.ini similarity index 100% rename from docker/inception/srcs/requirements/wordpress/conf/php.ini rename to docker/projects/inception/srcs/requirements/wordpress/conf/php.ini diff --git a/docker/inception/srcs/requirements/wordpress/conf/www.conf b/docker/projects/inception/srcs/requirements/wordpress/conf/www.conf similarity index 100% rename from docker/inception/srcs/requirements/wordpress/conf/www.conf rename to docker/projects/inception/srcs/requirements/wordpress/conf/www.conf diff --git a/docker/my-first-docker/Dockerfile b/docker/projects/my-first-docker/Dockerfile similarity index 100% rename from docker/my-first-docker/Dockerfile rename to docker/projects/my-first-docker/Dockerfile diff --git a/docker/my-first-docker/README.md b/docker/projects/my-first-docker/README.md similarity index 100% rename from docker/my-first-docker/README.md rename to docker/projects/my-first-docker/README.md diff --git a/docker/my-first-docker/index.js b/docker/projects/my-first-docker/index.js similarity index 100% rename from docker/my-first-docker/index.js rename to docker/projects/my-first-docker/index.js diff --git a/docker/my-first-docker/package-lock.json b/docker/projects/my-first-docker/package-lock.json similarity index 100% rename from docker/my-first-docker/package-lock.json rename to docker/projects/my-first-docker/package-lock.json diff --git a/docker/my-first-docker/package.json b/docker/projects/my-first-docker/package.json similarity index 100% rename from docker/my-first-docker/package.json rename to docker/projects/my-first-docker/package.json diff --git a/docker/nginx/Dockerfile b/docker/projects/nginx/Dockerfile similarity index 100% rename from docker/nginx/Dockerfile rename to docker/projects/nginx/Dockerfile diff --git a/docker/nginx/README.md b/docker/projects/nginx/README.md similarity index 100% rename from docker/nginx/README.md rename to docker/projects/nginx/README.md diff --git a/docker/nginx/config/nginx.conf b/docker/projects/nginx/config/nginx.conf similarity index 100% rename from docker/nginx/config/nginx.conf rename to docker/projects/nginx/config/nginx.conf diff --git a/docker/nginx/www/404.html b/docker/projects/nginx/www/404.html similarity index 100% rename from docker/nginx/www/404.html rename to docker/projects/nginx/www/404.html diff --git a/docker/nginx/www/index.html b/docker/projects/nginx/www/index.html similarity index 100% rename from docker/nginx/www/index.html rename to docker/projects/nginx/www/index.html diff --git a/docker/nginx/www/style.css b/docker/projects/nginx/www/style.css similarity index 100% rename from docker/nginx/www/style.css rename to docker/projects/nginx/www/style.css diff --git a/docker/projects/php/Dockerfile b/docker/projects/php/Dockerfile new file mode 100644 index 0000000..0fa0817 --- /dev/null +++ b/docker/projects/php/Dockerfile @@ -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"] + diff --git a/docker/projects/php/README.md b/docker/projects/php/README.md new file mode 100644 index 0000000..d0e7388 --- /dev/null +++ b/docker/projects/php/README.md @@ -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` diff --git a/docker/projects/php/index.php b/docker/projects/php/index.php new file mode 100644 index 0000000..eb1988d --- /dev/null +++ b/docker/projects/php/index.php @@ -0,0 +1,3 @@ + diff --git a/docker/wordpress/.env b/docker/projects/wordpress/.env similarity index 100% rename from docker/wordpress/.env rename to docker/projects/wordpress/.env diff --git a/docker/wordpress/Makefile b/docker/projects/wordpress/Makefile similarity index 100% rename from docker/wordpress/Makefile rename to docker/projects/wordpress/Makefile diff --git a/docker/wordpress/README.md b/docker/projects/wordpress/README.md similarity index 100% rename from docker/wordpress/README.md rename to docker/projects/wordpress/README.md diff --git a/docker/wordpress/custom/Dockerfile b/docker/projects/wordpress/custom/Dockerfile similarity index 100% rename from docker/wordpress/custom/Dockerfile rename to docker/projects/wordpress/custom/Dockerfile diff --git a/docker/wordpress/custom/README.md b/docker/projects/wordpress/custom/README.md similarity index 100% rename from docker/wordpress/custom/README.md rename to docker/projects/wordpress/custom/README.md diff --git a/docker/wordpress/custom/default.conf b/docker/projects/wordpress/custom/default.conf similarity index 100% rename from docker/wordpress/custom/default.conf rename to docker/projects/wordpress/custom/default.conf diff --git a/docker/wordpress/custom/index.php b/docker/projects/wordpress/custom/index.php similarity index 100% rename from docker/wordpress/custom/index.php rename to docker/projects/wordpress/custom/index.php diff --git a/docker/wordpress/docker-compose.yml b/docker/projects/wordpress/docker-compose.yml similarity index 100% rename from docker/wordpress/docker-compose.yml rename to docker/projects/wordpress/docker-compose.yml diff --git a/docker/wordpress/nginx/nginx.conf b/docker/projects/wordpress/nginx/nginx.conf similarity index 100% rename from docker/wordpress/nginx/nginx.conf rename to docker/projects/wordpress/nginx/nginx.conf diff --git a/git/README.md b/git/README.md new file mode 100644 index 0000000..04714a2 --- /dev/null +++ b/git/README.md @@ -0,0 +1,28 @@ +# Git + +[Git Reference](https://git-scm.com/docs) + +`git help`, `man git`, `git --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) diff --git a/github/README.md b/github/README.md index 9f41652..651a640 100644 --- a/github/README.md +++ b/github/README.md @@ -1,35 +1,3 @@ -# Git - -[Git Reference](https://git-scm.com/docs) - -`git help`, `man git`, `git --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 ` : 파일을 수정하기 전 상태로 되돌린다. -- `git restore --staged ` : 스테이징된 파일을 언스테이징한다. -- `git restore --source= ` : 특정 커밋의 파일을 수정하기 전 상태로 되돌린다. - -### fetch -- `git fetch` : 원격 저장소의 변경사항을 로컬 저장소로 가져온다. - # Github -## Github Pages +[Github로 프로젝트 관리하기](https://github.com/cheese10yun/github-project-management)