Compare commits
2 commits
Author | SHA1 | Date | |
---|---|---|---|
7fe9a2ba85 | |||
2316f0e70f |
3 changed files with 9 additions and 12 deletions
|
@ -104,7 +104,7 @@ services:
|
||||||
|
|
||||||
web:
|
web:
|
||||||
build: .
|
build: .
|
||||||
image: ghcr.io/mastodon/mastodon:v4.2.9
|
image: richarvey/mastodon-bird-ui:latest
|
||||||
restart: always
|
restart: always
|
||||||
env_file: .env.production
|
env_file: .env.production
|
||||||
command: bundle exec puma -C config/puma.rb
|
command: bundle exec puma -C config/puma.rb
|
||||||
|
|
17
build.sh
17
build.sh
|
@ -1,15 +1,12 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# update submodule to latest release
|
|
||||||
git submodule update --init --recursive
|
|
||||||
|
|
||||||
# get latest mastodon release number (needed to tag docker image)
|
|
||||||
mastodon_version=`curl -sL https://api.github.com/repos/mastodon/mastodon/releases/latest | jq -r ".tag_name"`
|
|
||||||
|
|
||||||
# Change to the main repo
|
# Change to the main repo
|
||||||
cd mastodon
|
cd mastodon
|
||||||
|
|
||||||
export MASTODON_VERSION_FOR_BIRD_UI="main"
|
# update submodule to latest main release
|
||||||
|
git checkout version/v4.3.0-alpha.1 && git fetch
|
||||||
|
|
||||||
|
export MASTODON_VERSION_FOR_BIRD_UI="nightly"
|
||||||
|
|
||||||
# Create a new folder for the theme
|
# Create a new folder for the theme
|
||||||
mkdir -p app/javascript/styles/mastodon-bird-ui
|
mkdir -p app/javascript/styles/mastodon-bird-ui
|
||||||
|
@ -50,10 +47,10 @@ for i in `ls ../diffs/` ; do patch -N config/locales/"${i/diff/yml}" < ../diffs/
|
||||||
# If the main branch of the repo build tagged version and latest image
|
# If the main branch of the repo build tagged version and latest image
|
||||||
cd ../
|
cd ../
|
||||||
BRANCH="$(git rev-parse --abbrev-ref HEAD)"
|
BRANCH="$(git rev-parse --abbrev-ref HEAD)"
|
||||||
if [[ "$BRANCH" == "main" ]]; then
|
if [[ "$BRANCH" == "nightly" ]]; then
|
||||||
echo 'Main branch';
|
echo 'Nightly branch';
|
||||||
# Build the images for multiple architectures
|
# Build the images for multiple architectures
|
||||||
cd mastodon
|
cd mastodon
|
||||||
docker buildx build --platform linux/amd64,linux/arm64 --push --tag richarvey/mastodon-bird-ui:$mastodon_version --tag richarvey/mastodon-bird-ui:latest . ;
|
docker buildx build --platform linux/amd64,linux/arm64 --push --tag richarvey/mastodon-bird-ui:nightly . ;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
2
mastodon
2
mastodon
|
@ -1 +1 @@
|
||||||
Subproject commit c93aacafdea188cac791b62a32e3117a7dc3e9cc
|
Subproject commit b1fbb459941822517421b6e4f625f8fd3b2dbde4
|
Loading…
Reference in a new issue