Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrating the Wine Prefix and updating the docker-compose #13

Merged
merged 4 commits into from
Nov 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ ARG WINE_MONO_VERSION=4.5.6
ENV \
HOME="/config" \
TITLE="ComicRack" \
WINEPREFIX=/config/.wine32 \
WINEPREFIX=/wine32 \
WINEARCH=win32 \
CUSTOM_PORT="9080" \
DISABLE_IPV6="true"

RUN \
Expand Down
39 changes: 39 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
.PHONY: help

.DEFAULT_GOAL := help

SHELL := /bin/bash

NAME := comicrack
ORG := pezhore
REPO := ${ORG}/${NAME}
TAG := $(shell git log -1 --pretty=format:"%h")
IMG := ${REPO}:${TAG}
LATEST := ${REPO}:latest


help: # http://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

release: ## tag a release from master and push to origin
bash -c '[[ -z `git status -s` ]]'
git tag -a -m release $(VERSION)
git push --tags


build: ## build the Docker image for this app
docker build --network=host --tag $(REPO) --rm=false .

login: ## Login to docker hub
docker login -u $(ORG)

push: ## push the latest Docker image to DockerHub
docker push $(REPO)

shell: ## run an interactive bash session in the container
docker run -it $(REPO) /bin/bash

run: ## run the container
docker run $(REPO)

deploy: build login push
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ services:
- PGID=1000
- TZ=Etc/UTC
volumes:
- /home/lab/src/comicrack-docker/local:/config/local
- /home/lab/src/comicrack-docker/roaming:/config/roaming
- /home/lab/src/comicrack-docker/local:/wine32/drive_c/users/abc/AppData/Local/cYo/ComicRack
- /home/lab/src/comicrack-docker/roaming:/wine32/drive_c/users/abc/AppData/Roaming/cYo/ComicRack
- /mnt/ds1618/comics:/config/comics
ports:
- 9001:3001
Expand Down
2 changes: 1 addition & 1 deletion root/defaults/autostart
Original file line number Diff line number Diff line change
@@ -1 +1 @@
wine /config/.wine32/drive_c/Program\ Files/ComicRack/ComicRack.exe
wine /wine32/drive_c/Program\ Files/ComicRack/ComicRack.exe
10 changes: 3 additions & 7 deletions root/etc/cont-init.d/30-config
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
#!/usr/bin/with-contenv bash

## This Config file will be used to set up the container for the first time
## other stuff may have to go here to deal with passwords and things.

# Symlink directories
mkdir -p /config/.wine32/drive_c/users/abc/AppData/Local/cYo/ComicRack
mkdir -p /config/.wine32/drive_c/users/abc/AppData/Roaming/cYo/ComicRack
ln -s /config/.wine32/drive_c/users/abc/AppData/Local/cYo/ComicRack /config/local
ln -s /config/.wine32/drive_c/users/abc/AppData/Roaming/cYo/ComicRack /config/roaming

# permissions

chown abc:abc /config
chown -R abc:abc /config/.wine*
chown -R abc:abc /wine32
Loading