Skip to content

Commit

Permalink
move folder
Browse files Browse the repository at this point in the history
  • Loading branch information
cupcakearmy committed Jan 2, 2022
1 parent 835f7df commit a0732a4
Show file tree
Hide file tree
Showing 58 changed files with 73 additions and 83 deletions.
4 changes: 2 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
target
node_modules
/**/target
/**/node_modules
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

# Backend
/target
target

# Client
.DS_Store
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.3.2] - 2022-01-02

### Changed

- Dependencies updates.
- Folder structure.

## [1.3.1] - 2021-12-30

### Added
Expand Down
14 changes: 8 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
# Client
FROM node:16-alpine as CLIENT

WORKDIR /tmp
COPY ./client ./
COPY ./frontend ./

RUN npm install -g pnpm
RUN pnpm install
RUN pnpm run build

FROM rust:1.51-alpine as RUST
# Rust
FROM rust:1.56-alpine as RUST

WORKDIR /tmp
RUN apk add libc-dev openssl-dev alpine-sdk
COPY ./Cargo* ./
COPY ./src ./src
COPY ./backend ./

RUN cargo build --release

FROM scratch
# Server
FROM alpine

WORKDIR /app
COPY --from=RUST /tmp/target/release/cryptgeon .
COPY --from=CLIENT /tmp/build ./client/build
COPY --from=CLIENT /tmp/build ./frontend/build

ENV MEMCACHE=memcached:11211

Expand Down
98 changes: 49 additions & 49 deletions Cargo.lock → backend/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml → backend/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[package]
name = "cryptgeon"
version = "1.3.0"
version = "1.3.2"
authors = ["cupcakearmy <[email protected]>"]
edition = "2018"
edition = "2021"

[[bin]]
name = "cryptgeon"
Expand Down
Loading

0 comments on commit a0732a4

Please sign in to comment.