Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: go-ignite/ignite
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: V1.4
Choose a base ref
...
head repository: go-ignite/ignite
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Oct 30, 2017

  1. Add vendor

    xwjdsh committed Oct 30, 2017
    Copy the full SHA
    aa3339f View commit details
  2. Update Dockerfile

    xwjdsh committed Oct 30, 2017
    Copy the full SHA
    4e19e23 View commit details

Commits on Oct 31, 2017

  1. Integration stats jobs

    xwjdsh committed Oct 31, 2017
    Copy the full SHA
    a5cc72e View commit details

Commits on Nov 19, 2017

  1. Refactor db connect

    xwjdsh committed Nov 19, 2017
    Copy the full SHA
    3554a72 View commit details

Commits on Nov 20, 2017

  1. Remove jobs

    xwjdsh committed Nov 20, 2017
    Copy the full SHA
    974ead1 View commit details

Commits on Nov 27, 2017

  1. add driver for sqlite

    TimothyYe authored Nov 27, 2017
    Copy the full SHA
    548c157 View commit details
  2. Create README.md

    TimothyYe authored Nov 27, 2017
    Copy the full SHA
    33769a4 View commit details

Commits on Nov 28, 2017

  1. Copy the full SHA
    f1ea104 View commit details

Commits on Nov 29, 2017

  1. && => AND, support sqlite3

    xwjdsh committed Nov 29, 2017
    Copy the full SHA
    e313985 View commit details
  2. Create LICENSE

    xwjdsh authored Nov 29, 2017
    Copy the full SHA
    081a8c2 View commit details

Commits on Nov 30, 2017

  1. Copy the full SHA
    0a71611 View commit details
  2. Copy the full SHA
    e5d6711 View commit details
  3. Copy the full SHA
    2347f47 View commit details
  4. Copy the full SHA
    8064bd9 View commit details
  5. Update dockerfile

    xwjdsh committed Nov 30, 2017
    Copy the full SHA
    884a139 View commit details

Commits on Dec 1, 2017

  1. add snapshots

    TimothyYe committed Dec 1, 2017
    Copy the full SHA
    60eed04 View commit details
  2. Copy the full SHA
    b29e970 View commit details
  3. Update dockerfile

    xwjdsh committed Dec 1, 2017
    Copy the full SHA
    9cf40bf View commit details
  4. Update dockerfile

    xwjdsh committed Dec 1, 2017
    Copy the full SHA
    ae0e153 View commit details
  5. Bug fix && update dockerfiles

    xwjdsh committed Dec 1, 2017
    Copy the full SHA
    5cf8f7a View commit details
  6. Copy the full SHA
    971569c View commit details
  7. update gitignore file

    TimothyYe committed Dec 1, 2017
    Copy the full SHA
    e5e0f02 View commit details
  8. Update Dockerfile

    xwjdsh committed Dec 1, 2017
    Copy the full SHA
    2e62e8d View commit details
  9. Update Dockerfile

    xwjdsh committed Dec 1, 2017
    Copy the full SHA
    f86260e View commit details
  10. Update README.md

    TimothyYe authored Dec 1, 2017
    Copy the full SHA
    ba569c2 View commit details
  11. Update README.md

    TimothyYe authored Dec 1, 2017
    Copy the full SHA
    a5e836b View commit details
  12. Update README.md

    xwjdsh authored Dec 1, 2017
    Copy the full SHA
    6c1da7b View commit details
  13. Copy the full SHA
    8f97290 View commit details
  14. Copy the full SHA
    3f3844e View commit details
  15. Update README.md

    TimothyYe authored Dec 1, 2017
    Copy the full SHA
    d8422ba View commit details
  16. Update README.md

    xwjdsh authored Dec 1, 2017
    Copy the full SHA
    e12c560 View commit details
  17. Remove unreachable code

    xwjdsh committed Dec 1, 2017
    Copy the full SHA
    2e62b73 View commit details
  18. Update config-temp.toml

    TimothyYe authored Dec 1, 2017
    Copy the full SHA
    1fc5703 View commit details
  19. Update config-temp.toml

    TimothyYe authored Dec 1, 2017
    Copy the full SHA
    78a1aa2 View commit details
  20. Copy the full SHA
    a74d968 View commit details

Commits on Dec 2, 2017

  1. Copy the full SHA
    6d5116c View commit details
  2. Bug fix

    xwjdsh committed Dec 2, 2017
    Copy the full SHA
    4289b1c View commit details
  3. add logo

    TimothyYe authored Dec 2, 2017
    Copy the full SHA
    7122e99 View commit details
  4. Update README.md

    TimothyYe authored Dec 2, 2017
    Copy the full SHA
    2d8182e View commit details
  5. update logo

    TimothyYe authored Dec 2, 2017
    Copy the full SHA
    8905d90 View commit details
  6. Delete ignite.png

    TimothyYe authored Dec 2, 2017
    Copy the full SHA
    270a9b2 View commit details
  7. update logo

    TimothyYe authored Dec 2, 2017
    Copy the full SHA
    a0912e8 View commit details
  8. Copy the full SHA
    bb3d11b View commit details
  9. Merge pull request #1 from go-ignite/develop

    Pull ss images before start program and create ss
    TimothyYe authored Dec 2, 2017
    Copy the full SHA
    24abe3c View commit details

Commits on Dec 3, 2017

  1. Copy the full SHA
    a1df361 View commit details

Commits on Dec 4, 2017

  1. Add badges

    xwjdsh committed Dec 4, 2017
    Copy the full SHA
    059f81d View commit details
  2. Typos fix

    xwjdsh committed Dec 4, 2017
    Copy the full SHA
    be7310b View commit details

Commits on Dec 5, 2017

  1. Add telegram badge

    xwjdsh committed Dec 5, 2017
    Copy the full SHA
    76634a1 View commit details
  2. Create .travis.yml

    xwjdsh authored Dec 5, 2017
    Copy the full SHA
    f3fc583 View commit details
  3. Add build status badge

    xwjdsh committed Dec 5, 2017
    Copy the full SHA
    ff7f613 View commit details
7 changes: 7 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
ignite
ignite.exe
ignite.exe~
.DS_Store
conf/config.toml
data
snapshots
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
static/* linguist-vendored
templates/* linguist-vendored
vendor/* linguist-vendored
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -2,6 +2,6 @@ ignite
ignite.exe
ignite.exe~
.DS_Store
config.toml
stats/stats
stats/stats.exe
conf/config.toml
data
vendor
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
language: go
go:
- 1.8.x
- 1.9.x
29 changes: 22 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,26 @@
FROM alpine
MAINTAINER Wendell Sun <iwendellsun@gmail.com>
FROM golang:1.9 as builder
ARG VERSION
WORKDIR /go/src/github.com/go-ignite/ignite
COPY . .
RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -ldflags "-X main.version=${VERSION}" -o ignite .


WORKDIR /ignite
FROM alpine
LABEL maintainer="go-ignite"
RUN apk --no-cache add ca-certificates tzdata sqlite \
&& cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
&& echo "Asia/Shanghai" > /etc/timezone \
&& apk del tzdata
# See https://stackoverflow.com/questions/34729748/installed-go-binary-not-found-in-path-on-alpine-linux-docker
RUN mkdir /lib64 && ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2
VOLUME /root/ignite/data

ADD ignite /ignite/ignite
ADD templates /ignite/templates
ADD static /ignite/static
WORKDIR /root/ignite
COPY --from=builder /go/src/github.com/go-ignite/ignite/ignite ./
COPY --from=builder /go/src/github.com/go-ignite/ignite/templates ./templates
COPY --from=builder /go/src/github.com/go-ignite/ignite/static ./static
COPY --from=builder /go/src/github.com/go-ignite/ignite/conf ./conf
RUN mv ./conf/config-temp.toml ./conf/config.toml

EXPOSE 5000
CMD ["/bin/sh", "-c", "./ignite"]
ENTRYPOINT ["./ignite"]
261 changes: 261 additions & 0 deletions Gopkg.lock

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

62 changes: 62 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
# Gopkg.toml example
#
# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
# for detailed Gopkg.toml documentation.
#
# required = ["github.com/user/thing/cmd/thing"]
# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
#
# [[constraint]]
# name = "github.com/user/project"
# version = "1.0.0"
#
# [[constraint]]
# name = "github.com/user/project2"
# branch = "dev"
# source = "github.com/myfork/project2"
#
# [[override]]
# name = "github.com/x/y"
# version = "2.4.0"
#
# [prune]
# non-go = false
# go-tests = true
# unused-packages = true


[[constraint]]
branch = "master"
name = "github.com/fsouza/go-dockerclient"

[[constraint]]
branch = "master"
name = "github.com/gin-contrib/sessions"

[[constraint]]
name = "github.com/gin-gonic/gin"
version = "1.2.0"

[[constraint]]
name = "github.com/go-sql-driver/mysql"
version = "1.3.0"

[[constraint]]
name = "github.com/go-xorm/xorm"
version = "0.7.0"

[[constraint]]
name = "github.com/mattn/go-sqlite3"
version = "1.6.0"

[[constraint]]
name = "github.com/pelletier/go-toml"
version = "1.1.0"

[[constraint]]
branch = "master"
name = "golang.org/x/crypto"

[prune]
go-tests = true
unused-packages = true
Loading