Skip to content

Commit 086c8ab

Browse files
authored
Merge pull request #38 from pythonkr/feat/docker-compose
docker compose 추가
2 parents a2d7d9c + 1004cc5 commit 086c8ab

7 files changed

Lines changed: 44 additions & 103 deletions

File tree

.gitignore

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
_site
2-
.sass-cache
3-
.jekyll-metadata
1+
*.gem
2+
.bundle
43
.DS_Store
4+
.sass-cache
5+
_site
6+
Gemfile.lock
7+
.jekyll-cache

Dockerfile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
FROM ruby:3.0
2+
3+
RUN bundle config --global frozen 1
4+
5+
WORKDIR /srv/jekyll
6+
7+
COPY Gemfile Gemfile.lock ./
8+
9+
RUN bundle install

Gemfile.lock

Lines changed: 0 additions & 89 deletions
This file was deleted.

_sass/_base.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ h1, h2, h3, h4, h5, h6,
3434
p, blockquote, pre,
3535
ul, ol, dl, figure,
3636
%vertical-rhythm {
37-
margin-bottom: $spacing-unit / 2;
37+
margin-bottom: 20px;
3838
}
3939

4040

@@ -112,7 +112,7 @@ a {
112112
blockquote {
113113
color: $grey-color;
114114
border-left: 4px solid $grey-color-light;
115-
padding-left: $spacing-unit / 2;
115+
padding-left: 20px;
116116
font-size: 18px;
117117
letter-spacing: -1px;
118118
font-style: italic;
@@ -167,8 +167,8 @@ pre {
167167
@include media-query($on-laptop) {
168168
max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit}));
169169
max-width: calc(#{$content-width} - (#{$spacing-unit}));
170-
padding-right: $spacing-unit / 2;
171-
padding-left: $spacing-unit / 2;
170+
padding-right: 20px;
171+
padding-left: 20px;
172172
}
173173
}
174174

_sass/_layout.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
@include media-query($on-palm) {
4646
position: absolute;
4747
top: 9px;
48-
right: $spacing-unit / 2;
48+
right: 20px;
4949
background-color: $background-color;
5050
border: 1px solid $grey-color-light;
5151
border-radius: 5px;
@@ -104,7 +104,7 @@
104104

105105
.footer-heading {
106106
font-size: 18px;
107-
margin-bottom: $spacing-unit / 2;
107+
margin-bottom: 20px;
108108
}
109109

110110
.contact-list,
@@ -116,14 +116,14 @@
116116
.footer-col-wrapper {
117117
font-size: 15px;
118118
color: $grey-color;
119-
margin-left: -$spacing-unit / 2;
119+
margin-left: -20px;
120120
@extend %clearfix;
121121
}
122122

123123
.footer-col {
124124
float: left;
125-
margin-bottom: $spacing-unit / 2;
126-
padding-left: $spacing-unit / 2;
125+
margin-bottom: 20px;
126+
padding-left: 20px;
127127
}
128128

129129
.footer-col-1 {

css/main.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ $on-laptop: 800px;
3333
// Use media queries like this:
3434
// @include media-query($on-palm) {
3535
// .wrapper {
36-
// padding-right: $spacing-unit / 2;
37-
// padding-left: $spacing-unit / 2;
36+
// padding-right: 20px;
37+
// padding-left: 20px;
3838
// }
3939
// }
4040
@mixin media-query($device) {

docker-compose.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
services:
2+
gemfile:
3+
working_dir: /srv/jekyll
4+
image: ruby:3.0
5+
command: ["bundle", "install"]
6+
volumes:
7+
- .:/srv/jekyll
8+
dev:
9+
container_name: pyconkr-blog
10+
build:
11+
context: .
12+
dockerfile: Dockerfile
13+
command: ["bundle", "exec", "jekyll", "serve", "--host", "0.0.0.0", "-l"]
14+
ports:
15+
- "4000:4000"
16+
- "35729:35729"
17+
volumes:
18+
- .:/srv/jekyll

0 commit comments

Comments
 (0)