Skip to content

Commit

Permalink
feat: Add compose.yml and replace VERSION with .env
Browse files Browse the repository at this point in the history
  • Loading branch information
jhwohlgemuth committed Dec 1, 2024
1 parent 2c2d3ac commit daeafdf
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 6 deletions.
3 changes: 3 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
VERSION=0.0.16
REGISTRY=ghcr.io
GITHUB_ACTOR=jhwohlgemuth
2 changes: 1 addition & 1 deletion .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
branches:
- main
paths:
- VERSION
- .env
- Dockerfile.dev
- provision/functions/**
- provision/scripts/dev/**
Expand Down
15 changes: 14 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,18 @@
"titleBar.inactiveBackground": "#0db7ed99",
"titleBar.inactiveForeground": "#15202b99"
},
"peacock.color": "#0db7ed"
"peacock.color": "#0db7ed",
"files.exclude": {
"**/*.vo": true,
"**/*.vok": true,
"**/*.vos": true,
"**/*.aux": true,
"**/*.glob": true,
"**/.git": true,
"**/.svn": true,
"**/.hg": true,
"**/CVS": true,
"**/.DS_Store": true,
"**/Thumbs.db": true
}
}
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
.PHONY: check lint format

include .env

format:
@for script in $(SCRIPTS) ; do \
dos2unix $$script; \
Expand Down Expand Up @@ -60,9 +63,6 @@ web-push:
#
# Build variables
#
VERSION = `cat VERSION`
REGISTRY = ghcr.io
GITHUB_ACTOR = jhwohlgemuth
IMAGES = \
dev \
notebook \
Expand Down
1 change: 0 additions & 1 deletion VERSION

This file was deleted.

34 changes: 34 additions & 0 deletions compose.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: "gold"
services:
proxy:
container_name: "proxy"
image: "ghcr.io/jhwohlgemuth/web:${VERSION}"
ports:
- "4873:4873"
restart: unless-stopped
tty: true
dev:
container_name: "env"
environment:
- CODE_SERVER_PORT=1337
- CODE_SERVER_PASSWORD=password
deploy:
resources:
reservations:
devices:
- driver: nvidia
count: 1
capabilities: [gpu]
image: ghcr.io/jhwohlgemuth/gold:latest
ports:
- "1337:1337"
- "13337:13337"
privileged: true
restart: unless-stopped
tty: true
volumes:
- "/var/run/docker.sock:/var/run/docker.sock"
ulimits:
nofile:
soft: "65536"
hard: "65536"

1 comment on commit daeafdf

@jhwohlgemuth
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.