Skip to content

Commit

Permalink
Move to docker development.
Browse files Browse the repository at this point in the history
  • Loading branch information
kwbunker committed Nov 3, 2024
1 parent 19ad26e commit 0e15c3b
Show file tree
Hide file tree
Showing 33 changed files with 3,208 additions and 11,373 deletions.
34 changes: 34 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Use the official Ruby image from the Docker Hub
FROM ruby:2.7

# Install dependencies
RUN apt-get update -qq && apt-get install -y \
build-essential \
libpq-dev \
nodejs \
pandoc \
python3-pip

# Install pandoc-xnos filters via pip
RUN pip3 install pandoc-xnos pandoc-fignos pandoc-eqnos pandoc-tablenos pandoc-secnos --user

# Add the user's local bin directory to the PATH
ENV PATH=$PATH:/root/.local/bin

# Update RubyGems to a compatible version
RUN gem update --system 3.3.22

# Set the working directory
WORKDIR /usr/src/app

# Copy the Gemfile and Gemfile.lock into the image
COPY Gemfile* ./

# Install the gems specified in the Gemfile
RUN gem install bundler:2.4.17 && bundle install

# Copy the rest of the application code into the image
COPY . .

# Expose port 4000 to the host
EXPOSE 4000
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GEM
eventmachine (1.2.7)
ffi (1.15.5)
forwardable-extended (2.6.0)
google-protobuf (3.23.4-x64-mingw-ucrt)
google-protobuf (3.23.4-x86_64-linux)
http_parser.rb (0.8.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
Expand Down Expand Up @@ -53,16 +53,16 @@ GEM
rexml (3.2.5)
rouge (4.1.2)
safe_yaml (1.0.5)
sass-embedded (1.63.6-x64-mingw-ucrt)
sass-embedded (1.63.6-x86_64-linux-gnu)
google-protobuf (~> 3.23)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
unicode-display_width (2.4.2)
webrick (1.8.1)

PLATFORMS
ruby
x64-mingw-ucrt
x86_64-linux

DEPENDENCIES
jekyll (>= 3.6.3)
Expand Down
6 changes: 6 additions & 0 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,14 @@ incremental: false
# Exclude
exclude:
- /raw-content
- /.git/
- /.github
- /.gitignore
- /ta-notes
- /README.md
- /Gemfile.lock
- /Dockerfile
- /compose.yaml

# Markdown Processing
kramdown:
Expand Down
3 changes: 3 additions & 0 deletions _config_docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# _config_docker.yml
url: "http://localhost:4000"
baseurl: "/PHYS-3330"
308 changes: 81 additions & 227 deletions _includes/complex.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</div>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
<script src="{{ site.url }}{{ site.baseurl }}/js/bootstrap.min.js"></script>
<script src="{{ site.baseurl }}/js/bootstrap.min.js"></script>
<!--Back to top button! https://github.com/vfeskov/vanilla-back-to-top-->
<script src="https://unpkg.com/vanilla-back-to-top@7.2.1/dist/vanilla-back-to-top.min.js"></script>
<script>addBackToTop({
Expand Down
6 changes: 3 additions & 3 deletions _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape }}{% endif %}</title>
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
<link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl | prepend: site.url}}">
<link rel="stylesheet" href="{{ site.baseurl }}/css/main.css">
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
<link rel="shortcut icon" type ="image/x-icon" href="{{ site.url }}{{ site.baseurl }}/images/favicon.ico">
</head>
<link rel="shortcut icon" type="image/x-icon" href="{{ site.baseurl }}/images/favicon.ico">
</head>
62 changes: 28 additions & 34 deletions _includes/header.html
Original file line number Diff line number Diff line change
@@ -1,40 +1,34 @@
<div class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>

<a class="navbar-brand" href="{{ site.url }}{{ site.baseurl }}/">PHYS 3330 - Electronics Lab</a>
</div>
<div class="collapse navbar-collapse" id="navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
<li><a href="{{ site.url }}{{ site.baseurl }}/">Home</a></li>
<li><a href="{{ site.url }}{{ site.baseurl }}/lab-guides">Lab Guides</a></li>
<li><a href="{{ site.url }}{{ site.baseurl }}/report-lab-issue">Report a Lab Issue</a></li>
<li class="dropdown">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{{ site.baseurl }}/">PHYS 3330 - Electronics Lab</a>
</div>
<div class="collapse navbar-collapse" id="navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
<li><a href="{{ site.baseurl }}/">Home</a></li>
<li><a href="{{ site.baseurl }}/lab-guides">Lab Guides</a></li>
<li><a href="{{ site.baseurl }}/report-lab-issue">Report a Lab Issue</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">More Resources<span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="{{ site.url }}{{ site.baseurl }}/manuals-data-sheets">Data Sheets and Instrument Manuals</a></li>
{% comment %} <li><a href="{{ site.url }}{{ site.baseurl }}/mathematica-resources">Mathematica Resources</a></li> {% endcomment %}
<li><a href="{{ site.url }}{{ site.baseurl }}/resources/complex">Complex Number Review</a></li>
{% comment %} <li><a href="{{ site.url }}{{ site.baseurl }}/lab-guides/lsa3">LTspice</a></li> {% endcomment %}
<li><a href="{{ site.url }}{{ site.baseurl }}/final-project-examples">Final Project Examples</a></li>
<li><a href="{{ site.url }}{{ site.baseurl }}/lab-notebook">Lab Notebook</a></li>
<li><a href="{{ site.url }}{{ site.baseurl }}/lab-safety">Lab Safety</a></li>
<li><a href="{{ site.url }}{{ site.baseurl }}/soldering">Soldering Resources</a></li>


<!-- <li role="separator" class="divider"></li>
<li><a href="#">Separated link</a></li>
<li role="separator" class="divider"></li>
<li><a href="#">One more separated link</a></li> -->
<li><a href="{{ site.baseurl }}/manuals-data-sheets">Data Sheets and Instrument Manuals</a></li>
{% comment %} <li><a href="{{ site.baseurl }}/mathematica-resources">Mathematica Resources</a></li> {% endcomment %}
<li><a href="{{ site.baseurl }}/resources/complex">Complex Number Review</a></li>
{% comment %} <li><a href="{{ site.baseurl }}/lab-guides/lsa3">LTspice</a></li> {% endcomment %}
<li><a href="{{ site.baseurl }}/final-project-examples">Final Project Examples</a></li>
<li><a href="{{ site.baseurl }}/lab-notebook">Lab Notebook</a></li>
<li><a href="{{ site.baseurl }}/lab-safety">Lab Safety</a></li>
<li><a href="{{ site.baseurl }}/soldering">Soldering Resources</a></li>
</ul>
</li>
</ul>
</ul>
</div>
</div>
</div>
</div>
</div>
Loading

0 comments on commit 0e15c3b

Please sign in to comment.