* Add workaround for #3102 until cross-compile work complete * Minor cleanup --------- Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
This commit is contained in:
parent
8992965c0c
commit
40ff77eee2
2 changed files with 59 additions and 7 deletions
|
@ -24,9 +24,12 @@ services:
|
||||||
logging: *default-logging
|
logging: *default-logging
|
||||||
|
|
||||||
lemmy:
|
lemmy:
|
||||||
|
# use "image" to pull down an already compiled lemmy. make sure to comment out "build".
|
||||||
# image: dessalines/lemmy:0.18.1
|
# image: dessalines/lemmy:0.18.1
|
||||||
# use this to build your local lemmy server image for development
|
# platform: linux/x86_64 # no arm64 support. uncomment platform if using m1.
|
||||||
# run docker compose up --build
|
# use "build" to build your local lemmy server image for development. make sure to comment out "image".
|
||||||
|
# run: docker compose up --build
|
||||||
|
|
||||||
build:
|
build:
|
||||||
context: ../
|
context: ../
|
||||||
dockerfile: docker/Dockerfile
|
dockerfile: docker/Dockerfile
|
||||||
|
@ -51,12 +54,14 @@ services:
|
||||||
logging: *default-logging
|
logging: *default-logging
|
||||||
|
|
||||||
lemmy-ui:
|
lemmy-ui:
|
||||||
|
# use "image" to pull down an already compiled lemmy-ui. make sure to comment out "build".
|
||||||
image: dessalines/lemmy-ui:0.18.1
|
image: dessalines/lemmy-ui:0.18.1
|
||||||
# use this to build your local lemmy ui image for development
|
# platform: linux/x86_64 # no arm64 support. uncomment platform if using m1.
|
||||||
# run docker compose up --build
|
# use "build" to build your local lemmy ui image for development. make sure to comment out "image".
|
||||||
# assuming lemmy-ui is cloned besides lemmy directory
|
# run: docker compose up --build
|
||||||
|
|
||||||
# build:
|
# build:
|
||||||
# context: ../../lemmy-ui
|
# context: ../../lemmy-ui # assuming lemmy-ui is cloned besides lemmy directory
|
||||||
# dockerfile: dev.dockerfile
|
# dockerfile: dev.dockerfile
|
||||||
environment:
|
environment:
|
||||||
# this needs to match the hostname defined in the lemmy service
|
# this needs to match the hostname defined in the lemmy service
|
||||||
|
|
|
@ -1,6 +1,53 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
|
Help()
|
||||||
|
{
|
||||||
|
# Display help
|
||||||
|
echo "Usage: ./docker_update.sh [OPTIONS]"
|
||||||
|
echo ""
|
||||||
|
echo "Start all docker containers required to run Lemmy."
|
||||||
|
echo ""
|
||||||
|
echo "Options:"
|
||||||
|
echo "-u Docker username. Only required if managing Docker via Docker Desktop with a personal access token."
|
||||||
|
echo "-h Print this help."
|
||||||
|
}
|
||||||
|
|
||||||
|
while getopts ":hu:" option; do
|
||||||
|
case $option in
|
||||||
|
h) Help
|
||||||
|
exit;;
|
||||||
|
u) DOCKER_USER=$OPTARG
|
||||||
|
;;
|
||||||
|
*) echo "Invalid option $OPTARG."
|
||||||
|
exit;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
LOG_PREFIX="[🐀 lemmy]"
|
||||||
|
ARCH=$(uname -m 2>/dev/null || echo 'unknown') # uname may not exist on windows machines; default to unknown to be safe.
|
||||||
|
|
||||||
mkdir -p volumes/pictrs
|
mkdir -p volumes/pictrs
|
||||||
|
|
||||||
|
echo "$LOG_PREFIX Please provide your password to change ownership of the pictrs volume."
|
||||||
sudo chown -R 991:991 volumes/pictrs
|
sudo chown -R 991:991 volumes/pictrs
|
||||||
sudo docker compose up -d --build
|
|
||||||
|
if [ "$ARCH" = 'arm64' ]; then
|
||||||
|
echo "$LOG_PREFIX WARN: If building from images, make sure to uncomment 'platform' in the docker-compose.yml file!"
|
||||||
|
|
||||||
|
# You need a Docker account to pull images. Otherwise, you will get an error like: "error getting credentials"
|
||||||
|
if [ -z "$DOCKER_USER" ]; then
|
||||||
|
echo "$LOG_PREFIX Logging into Docker Hub..."
|
||||||
|
docker login
|
||||||
|
else
|
||||||
|
echo "$LOG_PREFIX Logging into Docker Hub. Please provide your personal access token."
|
||||||
|
docker login --username="$DOCKER_USER"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "$LOG_PREFIX Initializing images in the background. Please be patient if compiling from source..."
|
||||||
|
docker compose up -d --build
|
||||||
|
else
|
||||||
|
sudo docker compose up -d --build
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "$LOG_PREFIX Complete! You can now access the UI at http://localhost:1236."
|
||||||
|
|
Loading…
Reference in a new issue