Commit e39b6c0c authored by TonyFord's avatar TonyFord
Browse files

add gitlab env vars

parent 99152b6c
Pipeline #929 failed with stage
in 4 seconds
......@@ -23,6 +23,8 @@ build-faircoind:
- master
variables:
- $CMD =~ /build-faircoind/
before_script:
- mkdir -p ~/.faircoin2
script:
- docker-compose build faircoin
......
......@@ -114,8 +114,10 @@ RUN gem install jekyll -v$JEKYLL_VERSION -- \
RUN bundle install
# --
RUN addgroup -Sg 998 jekyll
RUN adduser -Su 999 -G \
ARG GITLAB_RUNNER_GID
ARG GITLAB_RUNNER_UID
RUN addgroup -Sg $GITLAB_RUNNER_GID jekyll
RUN adduser -Su $GITLAB_RUNNER_UID -G \
jekyll jekyll
# --
......@@ -141,5 +143,3 @@ CMD ["jekyll", "--help"]
ENTRYPOINT ["/usr/jekyll/bin/entrypoint"]
WORKDIR /srv/jekyll
VOLUME /srv/jekyll
EXPOSE 35729
EXPOSE 4000
......@@ -35,8 +35,10 @@ RUN rm -rf /var/lib/apt/lists/* && \
#####################################################################################root##
### create and run user account to image ##################################################
RUN groupadd -g 998 faircoin
RUN useradd --create-home --shell /bin/bash faircoin --uid 999 --gid 998
ARG GITLAB_RUNNER_GID
ARG GITLAB_RUNNER_UID
RUN groupadd -g $GITLAB_RUNNER_GID faircoin
RUN useradd --create-home --shell /bin/bash faircoin --uid $GITLAB_RUNNER_UID --gid $GITLAB_RUNNER_GID
USER faircoin
#################################################################################faircoin##
......@@ -62,4 +64,4 @@ RUN ./faircoind -daemon -reindex && \
./faircoin-cli stop && \
sleep 10
ENTRYPOINT ["./faircoind"]
ENTRYPOINT ["./faircoind -daemon -disablewallet"]
......@@ -3,11 +3,17 @@ version: "3.1"
services:
jekyll-server:
build: ./
build:
context: ./
args:
GITLAB_RUNNER_UID: "${GITLAB_RUNNER_UID}"
GITLAB_RUNNER_GID: "${GITLAB_RUNNER_GID}"
env_file:
- ${FAIRCOIN_CONF}
container_name: pulse.faircoin.co-jekyll-server
restart: always
command: jekyll serve
user: "999:998"
command: jekyll serve --port ${JEKYLL_SERVER_PORT}
user: "${GITLAB_RUNNER_UID}:${GITLAB_RUNNER_GID}"
network_mode: "host"
volumes:
- .:/srv/jekyll
......@@ -28,19 +34,16 @@ services:
dockerfile: Dockerfile_faircoin
args:
source_repository: "https://github.com/faircoin/faircoin.git"
GITLAB_RUNNER_UID: "${GITLAB_RUNNER_UID}"
GITLAB_RUNNER_GID: "${GITLAB_RUNNER_GID}"
container_name: pulse.faircoin.co-faircoind
restart: always
command: ' -blocknotify="python3 /home/faircoin/script/getdata.py"'
# command: ' -blocknotify="python3 /home/faircoin/script/getdata.py"'
network_mode: "host"
ports:
- "8333:8333"
user: "999:998"
user: "${GITLAB_RUNNER_UID}:${GITLAB_RUNNER_GID}"
volumes:
- .faircoin2:/home/faircoin/.faircoin2
- ~/.faircoin2:/home/faircoin/.faircoin2
- ./_data/faircoin:/home/faircoin/data
- ./script:/home/faircoin/script
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment