Skip to content

Commit

Permalink
feat: support arm / docker deploys of site
Browse files Browse the repository at this point in the history
  • Loading branch information
Jmainguy committed Oct 25, 2024
1 parent 8334708 commit 4abd98b
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 73 deletions.
1 change: 0 additions & 1 deletion config.yaml

This file was deleted.

11 changes: 6 additions & 5 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Maintainer Jonathan Mainguy [email protected]
FROM fedora as build
FROM fedora
# Set architecture-specific variables
ARG TARGETARCH
RUN dnf install -y bash-completion git gcc perl-CPAN perl-Curses ncurses-devel cmake gcc-c++
# asciiquarium
RUN curl https://raw.githubusercontent.com/Jmainguy/asciiquarium/main/asciiquarium --output /bin/asciiquarium
Expand All @@ -15,19 +17,18 @@ RUN mkdir -p /home/jmainguy/bin
ADD .gotty /home/jmainguy/.gotty
ADD bashrc /home/jmainguy/.bashrc
# Bible
RUN curl -L https://github.com/Jmainguy/bible/releases/download/v0.3.1/bible_Linux_x86_64.tar.gz --output /tmp/bible.tar.gz
# Download the correct binary based on architecture
RUN curl -L "https://github.com/Jmainguy/bible/releases/download/v0.3.2/bible_Linux_${TARGETARCH}.tar.gz" -o /tmp/bible.tar.gz
RUN tar zxvf /tmp/bible.tar.gz
RUN cp bible /home/jmainguy/bin/
RUN mkdir -p /home/jmainguy/.bible/
RUN curl -L https://github.com/Jmainguy/bible/raw/main/database/bible.db --output /home/jmainguy/.bible/bible.db
RUN cp database/bible.db /home/jmainguy/.bible/bible.db
# Bak
RUN curl https://raw.githubusercontent.com/Jmainguy/bak/main/bak --output /home/jmainguy/bin/bak
RUN chmod +x /home/jmainguy/bin/*
RUN dnf install -y python3-xattr

FROM fedora as middle
ADD motd /etc/motd
COPY --from=build /home/jmainguy /home/jmainguy
RUN useradd jmainguy
RUN chown -R jmainguy:jmainguy /home/jmainguy

Expand Down
2 changes: 1 addition & 1 deletion docker/Jonathan_Mainguy_Profile/blog.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# This is a personal blog.
# This is my personal blog.
https://jmainguy.com
1 change: 0 additions & 1 deletion docker/Jonathan_Mainguy_Profile/email.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
# [email protected]
## You *should'nt be able to send an email from the shell here, sorry =)
mailto:[email protected]
4 changes: 2 additions & 2 deletions docker/Jonathan_Mainguy_Profile/github.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Personal Profile
https://github.com/Jmainguy
# Deprecated company profile when I ran a minecraft business
https://github.com/standouthost/multicraft
# My personal infrastructure organization
https://github.com/standouthost
7 changes: 1 addition & 6 deletions docker/Jonathan_Mainguy_Profile/projects.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ This is a incomplete list of projects and tools I have worked on, for a full lis

## This website

This website uses gotty (for the interactive shell), docker (to contain it, keep people from breaking things), iptables (to limit network), haproxy (to intercept http and websocket connections seperate), a custom router I wrote named soh-router (this intercepts websocket requests as passed by haproxy, then manages docker containers, then sends the socket to an available connection), sqlite3 (to store the available connections), systemd (to run the router as a service)
This website uses gotty (for the interactive shell), docker (to contain it, keep people from breaking things), iptables (to limit network), a custom router I wrote named soh-router (this intercepts websocket requests, then manages docker containers, then sends the socket to an available connection), sqlite3 (to store the available connections), systemd (to run the router as a service)

[https://github.com/Jmainguy/soh.re](https://github.com/Jmainguy/soh.re "This Website")

Expand All @@ -14,11 +14,6 @@ This is installed on this system for you to use.

[https://github.com/Jmainguy/bible](https://github.com/Jmainguy/bible "Bible")

## Repeatafterme
A golang daemon to like / retweet anything a list of users post. Useful for important twitter users to you which you think all your followers should also know about.

[https://github.com/Jmainguy/repeatafterme](https://github.com/Jmainguy/repeatafterme "Repeatafterme")

## Bak
bak is a single file/directory backup utility I wrote in python. The idea came about after taking a training course where the recommended we run really long commands to essentially cp a file and append .bak to the end, bak provides this and more in a much shorter and easier to remember command.

Expand Down
3 changes: 0 additions & 3 deletions docker/Jonathan_Mainguy_Profile/rhca_certified.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
# I was a certified Red Hat Architect.
# It is currently expired
# This means I had a RHCE, RHCSA
# And atleast 5 other Red Hat Certificates.
https://www.redhat.com/rhtapps/certification/verify/?certId=140-120-619
8 changes: 6 additions & 2 deletions docker/motd
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
Welcome to Jonathan Seth Mainguy's open source profile.
You might want to ls, to see what files are in here.
cat the files, to see what they contain.
This site has no challenges and is mainly a resume
cat the files, to see what they contain.

Some fun commands you might enjoy
- cmatrix (I didnt make this, its just fun)
- asciiquarium (I didnt make this, its just fun)
- bible (I wrote this program)
52 changes: 0 additions & 52 deletions soh-router.spec

This file was deleted.

0 comments on commit 4abd98b

Please sign in to comment.