Ivan/commento
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

everywhere: remove -ce suffix

Browse Source
This commit is contained in:
Adhityaa Chandrasekar 2018-12-28 12:41:45 -05:00
parent 5aa3bc86eb
commit 02615088ff
8 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Dockerfile
View File

@ -1,8 +1,8 @@
# backend build (api server) # backend build (api server)
FROM golang:1.10.2-alpine AS api-build FROM golang:1.10.2-alpine AS api-build
COPY ./api /go/src/commento-ce/api COPY ./api /go/src/commento/api
WORKDIR /go/src/commento-ce/api WORKDIR /go/src/commento/api
RUN apk update && apk add bash make git curl RUN apk update && apk add bash make git curl
RUN curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh RUN curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
@ -13,8 +13,8 @@ RUN make prod -j$(($(nproc) + 1))
# frontend build (html, js, css, images) # frontend build (html, js, css, images)
FROM node:10.3.0-alpine AS frontend-build FROM node:10.3.0-alpine AS frontend-build
COPY ./frontend /commento-ce/frontend/ COPY ./frontend /commento/frontend/
WORKDIR /commento-ce/frontend/ WORKDIR /commento/frontend/
RUN apk update && apk add bash make RUN apk update && apk add bash make
RUN npm install -g html-minifier@3.5.7 uglify-js@3.4.1 sass@1.5.1 RUN npm install -g html-minifier@3.5.7 uglify-js@3.4.1 sass@1.5.1
@ -25,8 +25,8 @@ RUN make prod -j$(($(nproc) + 1))
# templates build # templates build
FROM alpine:3.7 AS templates-build FROM alpine:3.7 AS templates-build
COPY ./templates /commento-ce/templates COPY ./templates /commento/templates
WORKDIR /commento-ce/templates WORKDIR /commento/templates
RUN apk update && apk add bash make RUN apk update && apk add bash make
@ -36,8 +36,8 @@ RUN make prod -j$(($(nproc) + 1))
# db build # db build
FROM alpine:3.7 AS db-build FROM alpine:3.7 AS db-build
COPY ./db /commento-ce/db COPY ./db /commento/db
WORKDIR /commento-ce/db WORKDIR /commento/db
RUN apk update && apk add bash make RUN apk update && apk add bash make
@ -47,19 +47,19 @@ RUN make prod -j$(($(nproc) + 1))
# final image # final image
FROM alpine:3.7 FROM alpine:3.7
COPY --from=api-build /go/src/commento-ce/api/build/prod/commento-ce /commento-ce/commento-ce COPY --from=api-build /go/src/commento/api/build/prod/commento /commento/commento
COPY --from=frontend-build /commento-ce/frontend/build/prod/*.html /commento-ce/ COPY --from=frontend-build /commento/frontend/build/prod/*.html /commento/
COPY --from=frontend-build /commento-ce/frontend/build/prod/css/*.css /commento-ce/css/ COPY --from=frontend-build /commento/frontend/build/prod/css/*.css /commento/css/
COPY --from=frontend-build /commento-ce/frontend/build/prod/js/*.js /commento-ce/js/ COPY --from=frontend-build /commento/frontend/build/prod/js/*.js /commento/js/
COPY --from=frontend-build /commento-ce/frontend/build/prod/images/* /commento-ce/images/ COPY --from=frontend-build /commento/frontend/build/prod/images/* /commento/images/
COPY --from=templates-build /commento-ce/templates/build/prod/templates/ /commento-ce/templates/ COPY --from=templates-build /commento/templates/build/prod/templates/ /commento/templates/
COPY --from=db-build /commento-ce/db/build/prod/db/ /commento-ce/db/ COPY --from=db-build /commento/db/build/prod/db/ /commento/db/
RUN apk update && apk add ca-certificates --no-cache RUN apk update && apk add ca-certificates --no-cache
EXPOSE 8080 EXPOSE 8080
WORKDIR /commento-ce/ WORKDIR /commento/
ENV COMMENTO_BIND_ADDRESS="0.0.0.0" ENV COMMENTO_BIND_ADDRESS="0.0.0.0"
ENTRYPOINT ["/commento-ce/commento-ce"] ENTRYPOINT ["/commento/commento"]

4
api/Makefile
View File

@ -7,9 +7,9 @@ PROD_BUILD_DIR = $(BUILD_DIR)/prod
GO_SRC_DIR = . GO_SRC_DIR = .
GO_SRC_FILES = $(wildcard $(GO_SRC_DIR)/*.go) GO_SRC_FILES = $(wildcard $(GO_SRC_DIR)/*.go)
GO_DEVEL_BUILD_DIR = $(DEVEL_BUILD_DIR) GO_DEVEL_BUILD_DIR = $(DEVEL_BUILD_DIR)
GO_DEVEL_BUILD_BINARY = $(GO_DEVEL_BUILD_DIR)/commento-ce GO_DEVEL_BUILD_BINARY = $(GO_DEVEL_BUILD_DIR)/commento
GO_PROD_BUILD_DIR = $(PROD_BUILD_DIR) GO_PROD_BUILD_DIR = $(PROD_BUILD_DIR)
GO_PROD_BUILD_BINARY = $(GO_PROD_BUILD_DIR)/commento-ce GO_PROD_BUILD_BINARY = $(GO_PROD_BUILD_DIR)/commento
devel: devel-go devel: devel-go

2
docker-compose.yml
View File

@ -2,7 +2,7 @@ version: '3'
services: services:
server: server:
image: registry.gitlab.com/commento/commento-ce image: registry.gitlab.com/commento/commento
ports: ports:
- 8080:8080 - 8080:8080
environment: environment:

28
etc/bsd-rc/commento Executable file
View File

@ -0,0 +1,28 @@
#!/bin/sh
# PROVIDE: commento
# REQUIRE: LOGIN postgresql
# KEYWORD: shutdown
PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin"
. /etc/rc.subr
desc="Commento daemon"
name=commento
rcvar=commento_enable
load_rc_config $name
: ${commento_enable:=NO}
commento_env="COMMENTO_ORIGIN=https://commento.example.com \
COMMENTO_PORT=8080 \
COMMENTO_POSTGRES=postgres://commento:commento@db:5432/commento?sslmode=disable \
COMMENTO_STATIC=/usr/local/share/commento"
commento_user=www
command="/usr/local/bin/commento"
command_args=" >> /var/log/commento/${name}.log 2>&1 &"
run_rc_command "$1"

28
etc/bsd-rc/commento_ce
View File

@ -1,28 +0,0 @@
#!/bin/sh
# PROVIDE: commento_ce
# REQUIRE: LOGIN postgresql
# KEYWORD: shutdown
PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin"
. /etc/rc.subr
desc="Commento CE daemon"
name=commento_ce
rcvar=commento_ce_enable
load_rc_config $name
: ${commento_ce_enable:=NO}
commento_ce_env="COMMENTO_ORIGIN=https://commento.example.com \
COMMENTO_PORT=8080 \
COMMENTO_POSTGRES=postgres://commento:commento@db:5432/commento?sslmode=disable \
COMMENTO_STATIC=/usr/local/share/commento-ce"
commento_ce_user=www
command="/usr/local/bin/commento-ce"
command_args=" >> /var/log/commento_ce/${name}.log 2>&1 &"
run_rc_command "$1"

6
etc/linux-systemd/commento-ce.service → etc/linux-systemd/commento.service
View File

@ -1,14 +1,14 @@
[Unit] [Unit]
Description=Commento-CE daemon service Description=Commento daemon service
After=network.target postgresql.service After=network.target postgresql.service
[Service] [Service]
Type=simple Type=simple
ExecStart=/usr/bin/commento-ce ExecStart=/usr/bin/commento
Environment=COMMENTO_ORIGIN=https://commento.example.com Environment=COMMENTO_ORIGIN=https://commento.example.com
Environment=COMMENTO_PORT=8080 Environment=COMMENTO_PORT=8080
Environment=COMMENTO_POSTGRES=postgres://commento:commento@db:5432/commento?sslmode=disable Environment=COMMENTO_POSTGRES=postgres://commento:commento@db:5432/commento?sslmode=disable
Environment=COMMENTO_STATIC=/usr/share/commento-ce Environment=COMMENTO_STATIC=/usr/share/commento
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

4
frontend/package.json
View File

@ -1,8 +1,8 @@
{ {
"name": "commento-ce", "name": "commento",
"version": "1.0.0", "version": "1.0.0",
"main": "index.js", "main": "index.js",
"repository": "git@gitlab.com:commento/commento-ce.git", "repository": "git@gitlab.com:commento/commento.git",
"author": "Adhityaa <c.adhityaa@gmail.com> Anton Linevych anton@linevich.net", "author": "Adhityaa <c.adhityaa@gmail.com> Anton Linevych anton@linevich.net",
"license": "MIT", "license": "MIT",
"private": true, "private": true,

2
scripts/autoserve
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
binary_name=commento-ce binary_name=commento
trap ctrl_c INT trap ctrl_c INT
ctrl_c() { ctrl_c() {