Merge upstream and update Gemfile.lock

.atom-build.yml

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

blog.bryanroessler.com/.atom-build.yml

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

blog.bryanroessler.com/Dockerfile

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

blog.bryanroessler.com/Gemfile.lock

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

blog.bryanroessler.com/build.sh

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

landing.bryanroessler.com/.atom-build.yml

@@ -1,2 +1,13 @@
-cmd: '{FILE_ACTIVE} {FILE_ACTIVE_PATH}'
+cmd: '{FILE_ACTIVE}'
 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'

landing.bryanroessler.com/build.sh

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