Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: fmtr/amniotic
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.4.0
Choose a base ref
...
head repository: fmtr/amniotic
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Loading
16 changes: 7 additions & 9 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -7,7 +7,6 @@ on:
description: 'Version'
required: true


jobs:
build:
runs-on: ubuntu-latest
@@ -19,6 +18,8 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

- name: Install Tools
run: |
@@ -32,9 +33,11 @@ jobs:
echo $DOCKER_TOKEN | docker login --username $DOCKER_USER --password-stdin
- name: Increment Version
env:
GIT_EMAIL: ${{ secrets.GIT_EMAIL }}
run: |
git config --global user.name 'Frontmatter Actions'
git config --global user.email 'actions@frontmatter.ai'
git config --global user.email "$GIT_EMAIL"
echo -n ${VERSION} > ${NAME}/version
python ha/addon/update_version.py ${VERSION}
git add ${NAME}/version
@@ -61,11 +64,6 @@ jobs:
run: |
twine upload dist/*
- name: Build Docker
run: |
docker build . --build-arg TYPE=release --build-arg VERSION=${VERSION} --tag fmtr/${NAME}:v${VERSION}
docker tag fmtr/${NAME}:v${VERSION} fmtr/${NAME}:latest
- name: Push Docker
- name: Build and Push Docker
run: |
docker push --all-tags fmtr/${NAME}
docker buildx build . --build-arg TYPE=release --build-arg VERSION=${VERSION} --tag fmtr/${NAME}:v${VERSION} --tag fmtr/${NAME}:latest --push --platform linux/386,linux/amd64,linux/arm/v5,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
9 changes: 7 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
ARG VERSION
ARG TYPE=development

FROM edwardbrown/python as base
FROM fmtr/python as base
ENV DEBIAN_FRONTEND=noninteractive

RUN useradd --uid 1000 --create-home amniotic

RUN apt -qq update -y
RUN apt -qq install -y pulseaudio vlc
RUN apt -qq install -y pulseaudio vlc alsa-utils

COPY amniotic.client.conf.template /amniotic.client.conf.template

FROM base AS development
WORKDIR /usr/src
6 changes: 6 additions & 0 deletions amniotic.client.conf.template
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
default-server = unix:{path}
# Prevent a server running in the container
autospawn = no
daemon-binary = /bin/true
# Prevent the use of shared memory
enable-shm = false
Loading