cleanup

Dockerfile

@@ -1,6 +1,5 @@
 FROM docker-registry1.in.thelinuxpro.net:5000/tlp/tlp_jekyll:0.0.1
 
-LABEL version="0.0.1"
 LABEL image.author.name="Kameron Kenny"
 LABEL image.author.email="kameron@localhost"
 LABEL description="A Jekyll site for photos.kameronkenny.com."
@@ -10,6 +9,8 @@ ARG LOCATION_JEKYLL="/usr/local/jekyll"
 ENV GEM_HOME="/usr/local/gems"
 ENV PATH="/usr/local/gems/bin:$PATH"
 ENV SITE="photos.kameronkenny.com"
+ENV SITE_ROOT="$LOCATION_JEKYLL/sites/$SITE
+ENV SITE_PATH="$SITE_ROOT/_site"
 ENV NGINX_CONF_D="$LOCATION_JEKYLL/nginx"
 
 ENV DEBIAN_FRONTEND=noninteractive
@@ -20,7 +21,7 @@ RUN apt install -y libmagick++-dev
 ### Shouldn't need this, it's in the Gemfile, but hold just in case.
 #RUN gem install rmagick exifr
 
-RUN mkdir -p $LOCATION_JEKYLL/sites/$SITE
+RUN mkdir -p $SITE_ROOT
 
 WORKDIR /usr/local/sbin
 COPY ./entrypoint.sh .
@@ -34,4 +35,14 @@ COPY . .
 RUN bundle install
 RUN JEKYLL_ENV=production bundle exec jekyll build
 
+## Cleanup to debulk the image
+
+RUN apt remove -y manpages ruby x11-common ruby* make python gcc cpp gnupg git git-man
+RUN apt -y autoremove
+RUN test -d $SITE_PATH && for i in $(ls -1 $SITE_ROOT | grep -v _site); do rm -rf $SITE_ROOT/$i ; done
+RUN rm -rf /root/.bundle/cache
+RUN rm -rf /var/cache
+RUN rm -rf /var/lib/apt
+RUN rm -rf /var/lib/dpkg
+
 ENTRYPOINT /usr/local/sbin/entrypoint.sh

Jenkinsfile

@@ -40,7 +40,8 @@ pipeline {
 	steps {
 	  script {
 	    //#def status_s = sh(returnStatus: true, script: 'grep $(docker --context pi502 compose ps | tail -n1 | awk \'{ print $2 }\') docker-compose.yml')
-	    sh 'docker --context pi502 compose pull photos_kameronkenny_com_web'
+	    sh 'docker --context pi502 pull docker-reigstry1.in.thelinuxpro.net:5000/sites/photos_kameronkenny_com_web:latest'
+	    sh 'docker --context pi502 compose pull photos_kameronkenny_com_web:latest'
 
 	    //if (status_s != 0) {
 	    //  sh 'docker --context pi502 compose up -d'

_config.yml

@@ -22,13 +22,6 @@ gallery:
     retina: 1.5
 
   # The following options are for individual galleries.
-gallery:
-  dir: photos
-  title: "Photos"
-  sort_field: "date"
-  thumbnail_size:
-    y: 450
-    retina: 1.5
   galleries:
     202404_eclipse:
       name: "2024 Eclipse"

app/conf/nginx/nginx.conf

@@ -32,7 +32,9 @@ http {
         	listen 4002 default_server;
 		#        listen [::]:80 default_server;
 
-        	root /usr/local/jekyll/sites/photos.kameronkenny.com/_site;
+		port_in_redirect off;
+
+        	root /usr/local/jekyll/sites/photos.kameronkenny.com/_site/photos;
 
         	index index.html index.htm;