Skip to content

allow building locally as well as with docker #467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 5, 2019
Merged

allow building locally as well as with docker #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c9e1cbb
allow building locally as well as with docker
jyn514 Nov 4, 2019
4c0a1ce
ignore rustwide-docker directory
jyn514 Nov 4, 2019
8544ced
run entrypoint in bash, not sh
jyn514 Nov 4, 2019
28fcc5f
use /opt/docsrs instead of /home/cratesfyi
jyn514 Nov 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/.rustwide
/.rustwide-docker
/ignored
**/target
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ target
.sass-cache
.vagrant
.rustwide
.rustwide-docker
4 changes: 2 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ services:
- "3000:3000"
volumes:
- "/var/run/docker.sock:/var/run/docker.sock"
- ".rustwide:/home/cratesfyi/rustwide"
- ".rustwide-docker:/opt/docsrs/rustwide"
- "cratesio-index:/opt/docsrs/prefix/crates.io-index"
environment:
CRATESFYI_RUSTWIDE_WORKSPACE: /home/cratesfyi/rustwide
CRATESFYI_RUSTWIDE_WORKSPACE: /opt/docsrs/rustwide
CRATESFYI_DATABASE_URL: postgresql://cratesfyi:password@db
env_file:
- .env
Expand Down
2 changes: 1 addition & 1 deletion docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/usr/bin/env bash

set -euv

Expand Down