bryan/www
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: bryan:d91d43fa01beb3a8d77f7394e495397f11c0aee6
Branches Tags
bryan:master
..
compare: bryan:b1f816924adbe24f17d6fdcc2c21d51445a0499f
Branches Tags
bryan:master

1 Commits
d91d43fa01 ... b1f816924a

Author SHA1 Message Date
bryan
b1f816924a Merge upstream and update Gemfile.lock 2020-01-26 03:31:36 -05:00
8 changed files with 24 additions and 26 deletions
Expand all files Collapse all files

2
.atom-build.yml
View File

@@ -1,2 +1,2 @@
cmd: './build.sh' cmd: '{FILE_ACTIVE} {FILE_ACTIVE_PATH}'
name: 'Run build.sh' name: 'Run build.sh'

2
blog.bryanroessler.com/.atom-build.yml
View File

@@ -1,2 +1,2 @@
cmd: '{FILE_ACTIVE}' cmd: '{FILE_ACTIVE} {FILE_ACTIVE_PATH}'
name: 'Run build.sh' name: 'Run build.sh'

2
blog.bryanroessler.com/Dockerfile
View File

@@ -1,7 +1,7 @@
FROM jekyll/jekyll FROM jekyll/jekyll
COPY --chown=jekyll:jekyll Gemfile . COPY --chown=jekyll:jekyll Gemfile .
COPY --chown=jekyll:jekyll Gemfile.lock . #COPY --chown=jekyll:jekyll Gemfile.lock .
RUN bundle install --clean RUN bundle install --clean

3
blog.bryanroessler.com/Gemfile.lock
View File

@@ -241,11 +241,10 @@ GEM
PLATFORMS PLATFORMS
ruby ruby
x64-mingw32
DEPENDENCIES DEPENDENCIES
github-pages (= 197) github-pages (= 197)
jekyll-paginate jekyll-paginate
BUNDLED WITH BUNDLED WITH
1.17.3 2.0.2

9
blog.bryanroessler.com/build.sh
View File

@@ -10,13 +10,14 @@
# jekyll:latest \ # jekyll:latest \
# bundle update # bundle update
podman build -t atomjekylltemp . podman build -t atomjekylltemp "$1"
podman run \ podman run \
--rm \ --rm \
-it \ -it \
-p 4000:4000 \ -p 4000:4000 \
-v "$PWD:/srv/jekyll" \ -v "${1}:/srv/jekyll" \
-v "$PWD/vendor/bundle:/usr/local/bundle" \ -v "${1}/vendor/bundle:/usr/local/bundle" \
localhost/atomjekylltemp localhost/atomjekylltemp \
/bin/bash
#podman rmi localhost/atomjekylltemp #podman rmi localhost/atomjekylltemp

0
build.sh Normal file → Executable file
View File

13
landing.bryanroessler.com/.atom-build.yml
View File

@@ -1,13 +1,2 @@
cmd: '{FILE_ACTIVE}' cmd: '{FILE_ACTIVE} {FILE_ACTIVE_PATH}'
name: 'Run build.sh' name: 'Run build.sh'
targets:
Persistent F31 container:
cmd: 'run-with-podman.sh --file {FILE_ACTIVE} --file-path {FILE_ACTIVE_PATH} --mode 1 --mask-dir RPMS --image fedora:latest --force-systemd -- -d -b'
Reset and run persistent F31 container:
cmd: 'run-with-podman.sh --file {FILE_ACTIVE} --file-path {FILE_ACTIVE_PATH} --mode 2 --mask-dir RPMS --image fedora:latest --force-systemd -- -d -b'
Nonpersistent F31 container w/ output:
cmd: 'run-with-podman.sh --file {FILE_ACTIVE} --file-path {FILE_ACTIVE_PATH} --mode 0 --image jekyll:latest'
Persistent F31 container w/ output:
cmd: 'run-with-podman.sh --file {FILE_ACTIVE} --file-path {FILE_ACTIVE_PATH} --mode 1 --image fedora:latest --force-systemd -- -d -b'
Reset and run persistent F31 container w/ output:
cmd: 'run-with-podman.sh --file {FILE_ACTIVE} --file-path {FILE_ACTIVE_PATH} --mode 2 --image fedora:latest --force-systemd -- -d -b'

19
landing.bryanroessler.com/build.sh
View File

@@ -10,13 +10,22 @@
# jekyll:latest \ # jekyll:latest \
# bundle update # bundle update
podman build -t atomjekylltemp2 . podman build -t atomjekylltemp2 "$1"
#podman run \
# --rm \
# -it \
# -p 4001:4000 \
# -v "${1}:/srv/jekyll" \
# -v "${1}/vendor/bundle:/usr/local/bundle" \
# localhost/atomjekylltemp2 \
# bundle --version
podman run \ podman run \
--rm \ --rm \
-it \ -it \
-p 4001:4000 \ -v "${1}:/srv/jekyll" \
-v "$PWD:/srv/jekyll" \ -v "${1}/vendor/bundle:/usr/local/bundle" \
-v "$PWD/vendor/bundle:/usr/local/bundle" \ localhost/atomjekylltemp2 \
localhost/atomjekylltemp2 bundle --version
#podman rmi localhost/atomjekylltemp_2 #podman rmi localhost/atomjekylltemp_2