Skip to content
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

Jump to bottom

Update 2016 -> 201623 for most documentation and makefile bits #335

Closed
wants to merge 1 commit into from
Closed

Update 2016 -> 201623 for most documentation and makefile bits #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ RUN set -e && \
cp /usr/local/sassc-$SASS_VERSION/bin/sassc /usr/local/bin/sassc && \
rm -rf /usr/local/sassc-$SASS_VERSION /usr/local/libsass-$SASS_VERSION

RUN mkdir -p /go/src/github.com/UniversityRadioYork/2016-site
WORKDIR /go/src/github.com/UniversityRadioYork/2016-site
RUN mkdir -p /go/src/github.com/UniversityRadioYork/201623-site
WORKDIR /go/src/github.com/UniversityRadioYork/201623-site

COPY . /go/src/github.com/UniversityRadioYork/2016-site
COPY . /go/src/github.com/UniversityRadioYork/201623-site

EXPOSE 3000

Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ build-sass: $(SASS_SRC)
$(SASS_COMPILER) $(MAIN_FILE) $(OUTPUT_FILE) -t compressed

build-docker-image:
docker build -t 2016-site .
docker build -t 201623-site .

docker:
docker run -it --rm -p 3000:3000 -v $$GOPATH/src/github.com/UniversityRadioYork/2016-site:/go/src/github.com/UniversityRadioYork/2016-site 2016-site
docker run -it --rm -p 3000:3000 -v $$GOPATH/src/github.com/UniversityRadioYork/201623-site:/go/src/github.com/UniversityRadioYork/201623-site 201623-site

clean:
rm -f $(OUTPUT_FILE) $(BINARY)
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 2016-site #
# 201623-site #

## How to install ##
Full instructions for installation are available in the USING.md file.
Expand Down
8 changes: 4 additions & 4 deletions USING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ export GOPATH=~/go

#### Pulling from git
* Make sure GOPATH is set (`echo $GOPATH`)
* `go get github.com/UniversityRadioYork/2016-site`
* This downloads 2016-site to ~/go/src/github.com/UniversityRadioYork/2016-site along with all necessary dependencies
* To update your working copy of the repo, running `go get` in the 2016-site directory, but you can also checkout to a specific branch if required:
* `go get github.com/UniversityRadioYork/201623-site`
* This downloads 201623-site to ~/go/src/github.com/UniversityRadioYork/201623-site along with all necessary dependencies
* To update your working copy of the repo, running `go get` in the 201623-site directory, but you can also checkout to a specific branch if required:
* `git checkout this-is-a-branch-name`

#### Running the server =====
Expand All @@ -51,7 +51,7 @@ export GOPATH=~/go

### Editing files
#### Ubuntu
Trivial. Open a file editor and browse to ~/go/src/github.com/UniversityRadioYork/2016-site
Trivial. Open a file editor and browse to ~/go/src/github.com/UniversityRadioYork/201623-site

#### Windows
* Windows likes to hide the actual files for the Ubuntu subsystem.
Expand Down
Loading