From ab4741f7e3deabd2c287cbe2711ceae3819f7071 Mon Sep 17 00:00:00 2001 From: Igor Velkov Date: Sun, 8 Sep 2019 00:27:33 +0300 Subject: [PATCH] remove unrelated files, add --frozen flag --- docker/nocross/Dockerfile | 6 ++--- docker/nocross/Dockerfile.org | 50 ----------------------------------- docker/nocross/deploy.sh | 31 ---------------------- 3 files changed, 3 insertions(+), 84 deletions(-) delete mode 100644 docker/nocross/Dockerfile.org delete mode 100644 docker/nocross/deploy.sh diff --git a/docker/nocross/Dockerfile b/docker/nocross/Dockerfile index 47e78490e..8818f2b9f 100644 --- a/docker/nocross/Dockerfile +++ b/docker/nocross/Dockerfile @@ -6,7 +6,7 @@ WORKDIR /app/ui COPY ui/package.json ui/yarn.lock ./ RUN yarn install --pure-lockfile --network-timeout 100000 -# Build +# Build COPY ui /app/ui RUN yarn build @@ -19,7 +19,7 @@ RUN USER=root cargo new server WORKDIR /app/server COPY server/Cargo.toml server/Cargo.lock ./ RUN mkdir -p ./src/bin \ - && echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs + && echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs RUN cargo build RUN rm -f ./target/debug/deps/lemmy_server* @@ -28,7 +28,7 @@ COPY server/migrations ./migrations/ # build for release #RUN cargo build --frozen --release -RUN cargo build +RUN cargo build --frozen # Get diesel-cli on there just in case # RUN cargo install diesel_cli --no-default-features --features postgres diff --git a/docker/nocross/Dockerfile.org b/docker/nocross/Dockerfile.org deleted file mode 100644 index 0eb5f60d1..000000000 --- a/docker/nocross/Dockerfile.org +++ /dev/null @@ -1,50 +0,0 @@ -FROM node:10-jessie as node -WORKDIR /app/ui - -# Cache deps -COPY ui/package.json ui/yarn.lock ./ -RUN yarn install --pure-lockfile - -# Build -COPY ui /app/ui -RUN yarn build - -FROM rust:latest as rust - -# Install musl -RUN apt-get update -RUN apt-get install musl-tools -y -RUN rustup target add x86_64-unknown-linux-musl - -# Cache deps -WORKDIR /app -RUN USER=root cargo new server -WORKDIR /app/server -COPY server/Cargo.toml server/Cargo.lock ./ -RUN mkdir -p ./src/bin \ - && echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs -RUN RUSTFLAGS=-Clinker=musl-gcc cargo build --release --target=x86_64-unknown-linux-musl -RUN rm -f ./target/x86_64-unknown-linux-musl/release/deps/lemmy_server* -COPY server/src ./src/ -COPY server/migrations ./migrations/ - -# build for release -RUN RUSTFLAGS=-Clinker=musl-gcc cargo build --frozen --release --target=x86_64-unknown-linux-musl - -# Get diesel-cli on there just in case -# RUN cargo install diesel_cli --no-default-features --features postgres - -FROM alpine:latest - -# Install libpq for postgres -RUN apk add libpq - -# Copy resources -COPY --from=rust /app/server/target/x86_64-unknown-linux-musl/release/lemmy_server /app/lemmy -COPY --from=node /app/ui/dist /app/dist -RUN addgroup -g 1000 lemmy -RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy -RUN chown lemmy:lemmy /app/lemmy -USER lemmy -EXPOSE 8536 -CMD ["/app/lemmy"] diff --git a/docker/nocross/deploy.sh b/docker/nocross/deploy.sh deleted file mode 100644 index e7ab706ff..000000000 --- a/docker/nocross/deploy.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -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_update.sh -docker tag dev_lemmy:latest dessalines/lemmy:$new_tag -docker push dessalines/lemmy:$new_tag - -# Pushing to any ansible deploys -cd ../../ansible -ansible-playbook lemmy.yml