Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
conduwuit
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
🥺
conduwuit
Commits
03380537
Commit
03380537
authored
4 years ago
by
Daniel Wiesenberg
Browse files
Options
Downloads
Patches
Plain Diff
Add ability to switch between local and remote build with build arg a...
...nd add env vars to docker-compose
parent
ecb64162
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Dockerfile
+12
-3
12 additions, 3 deletions
Dockerfile
docker-compose.yml
+7
-4
7 additions, 4 deletions
docker-compose.yml
with
19 additions
and
7 deletions
Dockerfile
+
12
−
3
View file @
03380537
...
...
@@ -7,6 +7,10 @@
# Alpine build image to build Conduits statically compiled binary
FROM
alpine:3.12
as
builder
# Specifies if the local project is build or if the git master branch
# is build.
ARG
LOCAL=false
# Add 'edge'-repository to get Rust 1.45
RUN
sed
-i
\
-e
's|v3\.12|edge|'
\
...
...
@@ -17,10 +21,15 @@ RUN apk add --no-cache \
cargo
\
openssl-dev
# Copy project from current folder and build it
# Copy project files from current folder
COPY
. .
RUN
cargo
install
--path
.
#RUN cargo install --git "https://git.koesters.xyz/timo/conduit.git"
# Build it from local files or from official git repository
RUN if
[[
$LOCAL
==
"true"
]]
;
then
\
cargo
install
--path
.
;
\
else
\
cargo
install
--git
"https://git.koesters.xyz/timo/conduit.git"
;
\
fi
########################## RUNTIME IMAGE ##########################
# Create new stage with a minimal image for the actual
...
...
This diff is collapsed.
Click to expand it.
docker-compose.yml
+
7
−
4
View file @
03380537
...
...
@@ -12,10 +12,13 @@ services:
environment
:
ROCKET_SERVER_NAME
:
example.com
# replace with your own name
### Uncomment and change values as needed
#ROCKET_LOG: normal
#ROCKET_REGISTRATION_DISABLED: 'true'
#ROCKET_DATABASE_PATH: /data/sled
#ROCKET_WORKERS: 10
# ROCKET_LOG: normal
# ROCKET_PORT: 14004
# ROCKET_REGISTRATION_DISABLED: 'true'
# ROCKET_ENCRYPTION_DISABLED: 'true'
# ROCKET_DATABASE_PATH: /srv/conduit/.local/share/conduit
# ROCKET_WORKERS: 10
# ROCKET_MAX_REQUEST_SIZE: 20_000_000 # in bytes, ~20 MB
volumes
:
db
:
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment