diff --git a/README.md b/README.md new file mode 100644 index 0000000..dbd519c --- /dev/null +++ b/README.md @@ -0,0 +1,17 @@ +# Welcome + +YouCock is a (now defunct) online shirine to all things Gareth Saunders. It originally lived at youcock.ga, and is now available at [youcock.jaywll.co](https://youcock.jaywll.co). + +We started it some time around the mid-aughts to catalogue and preserve the amazing antics of our good friend Gareth. Even when we created it was unashamedly retro, harking back to the days of geocities and some of the early web-design practices and paradigms that went with it. I don't think we had a copy of Macromedia Dreamweaver, but if we did then that's probably what we'd have used. Or maybe Microsoft Frontpage '98. + +Anyway, our preservation efforts seem successful because it's now some two decades later and the content still exists with only a few minor updates. It's now version controlled through git, and built to be deployed on modern app-hosting infrastructure. + +## Contributing + +The authoritative source repository for this content is at [code.jaywll.co](https://code.jaywll.co/jason/YouCock). + +I can't imagine anyone would want to contribute to this 20 year old website or have any use for the code, but whatever - it's available to you if that's your jam. + +The `master` and `release` branches are protected. If you do want to make changes clone the changes, create a new branch with a sensible name for the updates you want to make, and then create a pull request to merge those changes back into `master`. + +The public website is based on the `release` branch, and I will update it from `master` at my discretion. \ No newline at end of file diff --git a/captain-definition b/captain-definition index a3c5075..7e4c335 100644 --- a/captain-definition +++ b/captain-definition @@ -2,6 +2,7 @@ "schemaVersion": 2, "dockerfileLines": [ "FROM lipanski/docker-static-website", - "COPY ./app ." + "COPY httpd.conf httpd.conf", + "COPY ./www /www" ] } \ No newline at end of file diff --git a/devserver.sh b/devserver.sh deleted file mode 100644 index f9f08bf..0000000 --- a/devserver.sh +++ /dev/null @@ -1,4 +0,0 @@ -# Script used to spin up a local webserver for development - -#!/bin/bash -podman run -it --rm --init -p 3000:3000 $(podman build -q .) diff --git a/httpd.conf b/httpd.conf index fbb31f8..d88867d 100644 --- a/httpd.conf +++ b/httpd.conf @@ -1 +1 @@ -H:/app \ No newline at end of file +H:/www \ No newline at end of file diff --git a/Dockerfile b/local-test/Dockerfile similarity index 82% rename from Dockerfile rename to local-test/Dockerfile index f308dcd..3677885 100644 --- a/Dockerfile +++ b/local-test/Dockerfile @@ -1,3 +1,3 @@ FROM docker.io/lipanski/docker-static-website COPY httpd.conf httpd.conf -COPY ./app /app \ No newline at end of file +COPY ./www /www \ No newline at end of file diff --git a/local-test/start-server.sh b/local-test/start-server.sh new file mode 100644 index 0000000..0d67568 --- /dev/null +++ b/local-test/start-server.sh @@ -0,0 +1,6 @@ +# Script used to spin up a local webserver for development + +#!/bin/bash +CURR_DIR="$(pwd)" +cd ${PWD}/.. +podman run -it --rm --init -p 3000:3000 $(podman build -q -f ./local-test/Dockerfile .) \ No newline at end of file diff --git a/app/bkgrnd.jpg b/www/bkgrnd.jpg similarity index 100% rename from app/bkgrnd.jpg rename to www/bkgrnd.jpg diff --git a/app/index.html b/www/index.html similarity index 100% rename from app/index.html rename to www/index.html diff --git a/app/robots.txt b/www/robots.txt similarity index 100% rename from app/robots.txt rename to www/robots.txt diff --git a/app/splash.jpg b/www/splash.jpg similarity index 100% rename from app/splash.jpg rename to www/splash.jpg diff --git a/app/wiki/images/asleep.jpg b/www/wiki/images/asleep.jpg similarity index 100% rename from app/wiki/images/asleep.jpg rename to www/wiki/images/asleep.jpg diff --git a/app/wiki/images/breasts.jpg b/www/wiki/images/breasts.jpg similarity index 100% rename from app/wiki/images/breasts.jpg rename to www/wiki/images/breasts.jpg diff --git a/app/wiki/images/hair.jpg b/www/wiki/images/hair.jpg similarity index 100% rename from app/wiki/images/hair.jpg rename to www/wiki/images/hair.jpg diff --git a/app/wiki/images/hard.jpg b/www/wiki/images/hard.jpg similarity index 100% rename from app/wiki/images/hard.jpg rename to www/wiki/images/hard.jpg diff --git a/app/wiki/images/howyoudoin.jpg b/www/wiki/images/howyoudoin.jpg similarity index 100% rename from app/wiki/images/howyoudoin.jpg rename to www/wiki/images/howyoudoin.jpg diff --git a/app/wiki/images/msnprofile.jpg b/www/wiki/images/msnprofile.jpg similarity index 100% rename from app/wiki/images/msnprofile.jpg rename to www/wiki/images/msnprofile.jpg diff --git a/app/wiki/images/wonga.jpg b/www/wiki/images/wonga.jpg similarity index 100% rename from app/wiki/images/wonga.jpg rename to www/wiki/images/wonga.jpg diff --git a/app/wiki/index.html b/www/wiki/index.html similarity index 100% rename from app/wiki/index.html rename to www/wiki/index.html