Skip to content

Commit

Permalink
Merge pull request #121 from fhem/fix-packagePath
Browse files Browse the repository at this point in the history
fix: removed duplicate fhem/ in package namespace created
  • Loading branch information
sidey79 authored Jul 5, 2023
2 parents 3ca2caa + 994e104 commit a0adb9d
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
uses: docker/metadata-action@v4
with:
images: |
ghcr.io/${{ github.repository_owner }}/fhem/fhem-docker
ghcr.io/${{ github.repository_owner }}/fhem-docker
fhem/fhem
flavor: |
latest= ${{ fromJSON('["auto", "false"]')[github.event.release.prerelease == 1] }}
Expand Down Expand Up @@ -169,7 +169,7 @@ jobs:
uses: docker/metadata-action@v4
with:
images: |
ghcr.io/${{ github.repository_owner }}/fhem/fhem-docker
ghcr.io/${{ github.repository_owner }}/fhem-docker
fhem/fhem
flavor: |
latest= ${{ fromJSON('["auto", "false"]')[github.event.release.prerelease == 1] }}
Expand Down Expand Up @@ -220,7 +220,7 @@ jobs:
uses: docker/metadata-action@v4
with:
images: |
ghcr.io/${{ github.repository_owner }}/fhem/fhem-minimal-docker
ghcr.io/${{ github.repository_owner }}/fhem-minimal-docker
fhem/fhem-minimal
flavor: |
latest= ${{ fromJSON('["auto", "false"]')[github.event.release.prerelease == 1] }}
Expand Down
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Updated versions based on
- Supported Plattforms: linux/amd64, linux/arm/v7, linux/arm64
- NOTE: alexa-fhem, alexa-cookie, gassistant-fhem, homebridge, homebridge-fhem, tradfri-fhem are not installed per default!

docker pull ghcr.io/fhem/fhem/fhem-docker:bullseye
docker pull ghcr.io/fhem/fhem-docker:3-bullseye

- debian buster
- Perl 5.28.1
Expand All @@ -39,7 +39,7 @@ Updated versions based on
- Supported Plattforms: linux/amd64, linux/arm/v7, linux/arm64
- NOTE: alexa-fhem, alexa-cookie, gassistant-fhem, homebridge, homebridge-fhem, tradfri-fhem are not installed per default!

docker pull ghcr.io/fhem/fhem/fhem-docker:buster
docker pull ghcr.io/fhem/fhem-docker:3-buster

are available.

Expand All @@ -51,13 +51,13 @@ Updated versions based on
- Perl 5.32.1
- Supported Plattforms: linux/amd64, linux/arm/v7, linux/arm64, linux/i386,

docker pull ghcr.io/fhem/fhem/fhem-minimal-docker:bullseye
docker pull ghcr.io/fhem/fhem-minimal-docker:3-bullseye

- debian buster
- Perl 5.28.1
- Supported Plattforms: linux/amd64, linux/arm/v7, linux/arm64, linux/i386,

docker pull ghcr.io/fhem/fhem/fhem-minimal-docker:buster
docker pull ghcr.io/fhem/fhem-minimal-docker:3-buster

are available.

Expand All @@ -70,7 +70,7 @@ Updated versions based on
Usually you want to keep your FHEM setup after a container was destroyed (or re-build) so it is a good idea to provide an external directory on your Docker host to keep that data:


docker run -d --name fhem -p 8083:8083 -v /some/host/directory:/opt/fhem ghcr.io/fhem/fhem/fhem-docker:buster
docker run -d --name fhem -p 8083:8083 -v /some/host/directory:/opt/fhem ghcr.io/fhem/fhem/fhem-docker:3-buster

You will find more general information about using volumes from the Docker documentation for [Use volumes](https://docs.docker.com/storage/volumes/) and [Bind mounts](https://docs.docker.com/storage/bind-mounts/).

Expand All @@ -97,8 +97,9 @@ For that reason, the default value of the global attribute `logfile` is differen

It is highly recommended to keep this setting. Please note that FileLog devices might still need to be checked and adjusted manually if you would like to properly watch the log file from within FHEM.

### Add custom packages
### Add custom packages

Don't do this unless you really know what this does!
You may define several different types of packages to be installed automatically during initial start of the container by adding one of the following parameters to your container run command:

* Debian APT packages:
Expand Down
10 changes: 5 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ services:

# Minimum example w/o any custom environment variables
fhem:
image: fhem/fhem:latest
image: ghcr.io/fhem/fhem-docker:3-bullseye
restart: always
networks:
- net
Expand All @@ -34,7 +34,7 @@ services:

# Example w/ custom environment variables
fhem:
image: fhem/fhem:latest
image: ghcr.io/fhem/fhem-docker:3-bullseye
restart: always
networks:
- net
Expand All @@ -54,7 +54,7 @@ services:
# Example to connect USB to the container w/o
# privileged mode (preferred method)
fhem:
image: fhem/fhem:latest
image: ghcr.io/fhem/fhem-docker:3-bullseye
restart: always
networks:
- net
Expand All @@ -75,7 +75,7 @@ services:
# Example to connect USB to the container w/
# privileged mode (not recommended for security reasons)
fhem:
image: fhem/fhem:latest
image: ghcr.io/fhem/fhem-docker:3-bullseye
restart: always
privileged: true
networks:
Expand All @@ -96,7 +96,7 @@ services:
# Example for privileged container w/
# host network (not recommended for security reasons)
fhem:
image: fhem/fhem:latest
image: ghcr.io/fhem/fhem-docker:3-bullseye
restart: always
privileged: true
network_mode: "host"
Expand Down

0 comments on commit a0adb9d

Please sign in to comment.