Skip to content

Commit

Permalink
Merge pull request #1418 from rommapp/misc/docker-slim-suffix
Browse files Browse the repository at this point in the history
misc: Use flavor suffix option for Docker metadata action
  • Loading branch information
adamantike authored Jan 4, 2025
2 parents 0923140 + 4223a6d commit 598a7ae
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,13 @@ jobs:
images: |
name=rommapp/romm
name=ghcr.io/rommapp/romm
flavor: |
latest=auto
suffix=-slim,onlatest=true
tags: |
type=semver,pattern={{version}}-slim
type=semver,pattern={{major}}.{{minor}}-slim
type=semver,pattern={{major}}-slim
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}
labels: |
org.opencontainers.image.version={{version}}-slim
org.opencontainers.image.title="rommapp/romm"
Expand Down
2 changes: 2 additions & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@ COPY ./frontend/assets/default ${WEBSERVER_FOLDER}/assets/default
COPY ./frontend/assets/platforms ${WEBSERVER_FOLDER}/assets/platforms
COPY ./frontend/assets/scrappers ${WEBSERVER_FOLDER}/assets/scrappers
COPY ./frontend/assets/webrcade/feed ${WEBSERVER_FOLDER}/assets/webrcade/feed
COPY ./frontend/assets/emulatorjs ${WEBSERVER_FOLDER}/assets/emulatorjs
COPY ./frontend/assets/ruffle ${WEBSERVER_FOLDER}/assets/ruffle
RUN mkdir -p ${WEBSERVER_FOLDER}/assets/romm && \
ln -s /romm/resources ${WEBSERVER_FOLDER}/assets/romm/resources && \
ln -s /romm/assets ${WEBSERVER_FOLDER}/assets/romm/assets
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/views/Player/EmulatorJS/Base.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ function onPlay() {
}
window.EJS_fullscreenOnLoaded = fullScreenOnPlay.value;
window.EJS_pathtodata = "/assets/emulatorjs/";
window.EJS_pathtodata = "/assets/emulatorjs/data/";
const script = document.createElement("script");
script.src = "/assets/emulatorjs/loader.js";
script.src = "/assets/emulatorjs/data/loader.js";
script.onerror = () => {
window.EJS_pathtodata = `https://cdn.emulatorjs.org/${EMULATORJS_VERSION}/data`;
Expand Down

0 comments on commit 598a7ae

Please sign in to comment.