Fixing rest of deploy.
This commit is contained in:
parent
e9548ffed3
commit
502f63c4d4
4 changed files with 27 additions and 66 deletions
3
docker/dev/Dockerfile.armv7hf
vendored
3
docker/dev/Dockerfile.armv7hf
vendored
|
@ -35,7 +35,8 @@ COPY server/Cargo.toml server/Cargo.lock ./
|
|||
RUN mkdir -p ./src/bin \
|
||||
&& echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs
|
||||
#RUN cargo build --release
|
||||
RUN cargo build
|
||||
# RUN cargo build
|
||||
RUN RUSTFLAGS='-Ccodegen-units=1' cargo build
|
||||
COPY server/src ./src/
|
||||
COPY server/migrations ./migrations/
|
||||
RUN rm -f ./target/release/deps/lemmy_server* ; rm -f ./target/debug/deps/lemmy_server*
|
||||
|
|
62
docker/dev/d
vendored
62
docker/dev/d
vendored
|
@ -1,62 +0,0 @@
|
|||
#!/bin/bash -x
|
||||
|
||||
#git checkout master
|
||||
|
||||
# Creating the new tag
|
||||
new_tag="$1"
|
||||
#git tag $new_tag
|
||||
|
||||
# Setting the version on the front end
|
||||
pushd ../../ui/
|
||||
node set_version.js
|
||||
#git add src/version.ts
|
||||
popd
|
||||
|
||||
# Changing the docker-compose prod
|
||||
sed -i "s/dessalines\/lemmy:.*/dessalines\/lemmy:$new_tag/" ../prod/docker-compose.yml
|
||||
#git add ../prod/docker-compose.yml
|
||||
|
||||
# The commit
|
||||
#git commit -m"Upping version."
|
||||
|
||||
#git push origin $new_tag
|
||||
#git push
|
||||
|
||||
# Rebuilding docker
|
||||
docker-compose build
|
||||
docker tag dev_lemmy:latest shtripok/lemmy:x64-$new_tag
|
||||
docker push shtripok/lemmy:x64-$new_tag
|
||||
|
||||
# Build for Raspberry Pi armv7hf
|
||||
docker build -t lemmy:armv7hf -f Dockerfile.armv7hf ../../
|
||||
docker tag lemmy:armv7hf shtripok/lemmy:armv7hf-$new_tag
|
||||
docker push shtripok/lemmy:armv7hf-$new_tag
|
||||
|
||||
|
||||
docker build -t lemmy:aarch64 -f Dockerfile.aarch64 ../../
|
||||
docker tag lemmy:aarch64 shtripok/lemmy:arm64-$new_tag
|
||||
docker push shtripok/lemmy:arm-$new_tag
|
||||
|
||||
docker manifest create shtripok/lemmy:latest \
|
||||
shtripok/lemmy:armv7hf-$new_tag \
|
||||
shtripok/lemmy:x64-$new_tag \
|
||||
shtripok/lemmy:arm64-$new_tag
|
||||
|
||||
|
||||
#docker manifest create shtripok/pictshare:latest \
|
||||
#shtripok/pictshare:armv7 \
|
||||
#shtripok/pictshare:x64 \
|
||||
#shtripok/pictshare:arm64
|
||||
|
||||
docker manifest push shtripok/pictshare:latest
|
||||
|
||||
# Rebuilding the docker nocross
|
||||
# pushd ../nocross
|
||||
# docker-compose build
|
||||
# docker tag nocross_lemmy:latest dessalines/lemmy:nocross-$new_tag
|
||||
# docker push dessalines/lemmy:$new_tag
|
||||
# popd
|
||||
|
||||
# Pushing to any ansible deploys
|
||||
#cd ../../ansible
|
||||
#ansible-playbook lemmy.yml --become
|
26
docker/dev/deploy.sh
vendored
26
docker/dev/deploy.sh
vendored
|
@ -21,10 +21,32 @@ git commit -m"Version $new_tag"
|
|||
git push origin $new_tag
|
||||
git push
|
||||
|
||||
# Registering qemu binaries
|
||||
docker run --rm --privileged multiarch/qemu-user-static:register --reset
|
||||
|
||||
# Rebuilding docker
|
||||
docker-compose build
|
||||
docker tag dev_lemmy:latest dessalines/lemmy:$new_tag
|
||||
docker push dessalines/lemmy:$new_tag
|
||||
docker tag dev_lemmy:latest dessalines/lemmy:x64-$new_tag
|
||||
docker push dessalines/lemmy:x64-$new_tag
|
||||
|
||||
# Build for Raspberry Pi / other archs
|
||||
|
||||
# Arm currently not working
|
||||
# docker build -t lemmy:armv7hf -f Dockerfile.armv7hf ../../
|
||||
# docker tag lemmy:armv7hf dessalines/lemmy:armv7hf-$new_tag
|
||||
# docker push dessalines/lemmy:armv7hf-$new_tag
|
||||
|
||||
# aarch64
|
||||
docker build -t lemmy:aarch64 -f Dockerfile.aarch64 ../../
|
||||
docker tag lemmy:aarch64 dessalines/lemmy:arm64-$new_tag
|
||||
docker push dessalines/lemmy:arm64-$new_tag
|
||||
|
||||
# Creating the manifest for the multi-arch build
|
||||
docker manifest create dessalines/lemmy:$new_tag \
|
||||
dessalines/lemmy:x64-$new_tag \
|
||||
dessalines/lemmy:arm64-$new_tag
|
||||
|
||||
docker manifest push dessalines/lemmy:$new_tag
|
||||
|
||||
# Pushing to any ansible deploys
|
||||
cd ../../ansible
|
||||
|
|
2
docker/prod/docker-compose.yml
vendored
2
docker/prod/docker-compose.yml
vendored
|
@ -10,7 +10,7 @@ services:
|
|||
volumes:
|
||||
- lemmy_db:/var/lib/postgresql/data
|
||||
lemmy:
|
||||
image: dessalines/lemmy:v0.3.0.8
|
||||
image: dessalines/lemmy:v0.3.0.9
|
||||
ports:
|
||||
- "127.0.0.1:8536:8536"
|
||||
environment:
|
||||
|
|
Reference in a new issue