AverageMarcus/talks
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: AverageMarcus:0847d58bda6ee980e27664cdb76e79c54e9d3ae1
Branches Tags
AverageMarcus:master
AverageMarcus:personal-infra
..
compare: AverageMarcus:eb0384471cd964197683dadd0496cc3c7416f3a4
Branches Tags
AverageMarcus:master
AverageMarcus:personal-infra

No commits in common. "0847d58bda6ee980e27664cdb76e79c54e9d3ae1" and "eb0384471cd964197683dadd0496cc3c7416f3a4" have entirely different histories.
0847d58bda ... eb0384471c

6 changed files with 27 additions and 72 deletions
Show Stats Expand all files Collapse all files

1
.dockerignore
View File

@ -16,4 +16,3 @@ lerna-debug.log*
.vscode .vscode
*.code-workspace *.code-workspace
.history/ .history/
Dockerfile

19
Dockerfile
View File

@ -1,19 +0,0 @@
FROM node:14-alpine AS builder
WORKDIR /app
RUN npm install -g @marp-team/marp-cli
ADD . .
RUN find . -maxdepth 2 -mindepth 2 -name "*.md" -not -name "README.md" -print0 | xargs -0 marp {} \;
RUN mkdir -p out && \
find . -maxdepth 2 -mindepth 2 -name "*.html" -exec mv {} ./out/ \;
FROM nginx:stable-alpine
ENV NGINX_ENTRYPOINT_QUIET_LOGS=1
COPY --from=builder /app/out/* /usr/share/nginx/html/
ADD index.html /usr/share/nginx/html/index.html
RUN echo "server { listen 80; server_name localhost; location / { root /usr/share/nginx/html; index index.html; rewrite ^/([a-zA-Z0-9\-_]+)/?$ /\$1.html last; } }" > /etc/nginx/conf.d/default.conf

20
Makefile
View File

@ -1,6 +1,6 @@
.DEFAULT_GOAL := default .DEFAULT_GOAL := default
IMAGE ?= docker.cluster.fun/averagemarcus/talks:latest IMAGE ?= docker.cluster.fun/private/talks:latest
.PHONY: test # Run all tests, linting and format checks .PHONY: test # Run all tests, linting and format checks
test: lint check-format run-tests test: lint check-format run-tests
@ -33,11 +33,17 @@ run-tests:
.PHONY: fetch-deps # Fetch all project dependencies .PHONY: fetch-deps # Fetch all project dependencies
fetch-deps: fetch-deps:
@npm install -g @marp-team/marp-cli @echo "⚠️ 'fetch-deps' unimplemented"
# GO Projects
# @go mod tidy
# Node Projects
# @npm install
.PHONY: build # Build the project .PHONY: build # Build the project
build: lint check-format fetch-deps build: lint check-format fetch-deps
@find . -maxdepth 2 -mindepth 2 -name "*.md" -not -name "README.md" -print0 | xargs -0 marp {} \; @echo "⚠️ 'build' unimplemented"
# GO Projects
# @go build -o PROJECT_NAME main.go
.PHONY: docker-build # Build the docker image .PHONY: docker-build # Build the docker image
docker-build: docker-build:
@ -48,8 +54,12 @@ docker-publish:
@docker push $(IMAGE) @docker push $(IMAGE)
.PHONY: run # Run the application .PHONY: run # Run the application
run: docker-build run:
@docker run --rm -it -p 8080:80 $(IMAGE) @echo "⚠️ 'run' unimplemented"
# GO Projects
# @go run main.go
# Node Projects
# @npm start
.PHONY: ci # Perform CI specific tasks to perform on a pull request .PHONY: ci # Perform CI specific tasks to perform on a pull request
ci: ci:

1
PersonalInfrastructure/.gitignore vendored
View File

@ -1 +0,0 @@
*.html

25
PersonalInfrastructure/PersonalInfrastructure.md
View File

File diff suppressed because one or more lines are too long

33
index.html
View File

@ -1,33 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Talks</title>
<style>
body {
display: flex;
flex-direction: column;
text-align: center;
font-size: 2em;
font-family: monospace;
background-color: gainsboro;
}
a {
color: tomato !important;
}
</style>
</head>
<body>
<h1>Marcus Noble - Talks</h1>
<figure>
<iframe src="/PersonalInfrastructure" width="500px" height="300px"></iframe>
<figcaption>
<a href="/PersonalInfrastructure">Personal Infrastructure</a>
</figcaption>
</figure>
</body>
</html>