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.

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

Work with the latest CF / RecSync #15

Open
wants to merge 46 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
230c285
Update linter.yml
jeonghanlee Jul 6, 2020
25220e8
Update .dockerfilelintrc
jeonghanlee Jul 6, 2020
b5f9247
Delete .dockerfilelintrc
jeonghanlee Jul 6, 2020
0e2aea1
Update linter.yml
jeonghanlee Jul 6, 2020
3db7fc8
Update linter.yml
jeonghanlee Jul 6, 2020
43c248e
Merge branch 'ChannelFinder:master' into master
jeonghanlee Jun 24, 2021
04f90fb
switch to alscontrols, update it to the latest one
jeonghanlee Jun 25, 2021
0f009d7
rename it
jeonghanlee Jun 25, 2021
b18d624
switch to 18.04 as runner
jeonghanlee Jun 25, 2021
505e154
fixed typo
jeonghanlee Jun 25, 2021
7b9fbc7
use alscontrols
jeonghanlee Jun 25, 2021
4aaae8d
Merge branch 'ChannelFinder:master' into master
jeonghanlee Sep 18, 2022
0e0f2eb
update all to latest strucutre
jeonghanlee Sep 19, 2022
c960cae
test debian 11 github action
jeonghanlee Sep 19, 2022
3d805ff
debian11 github
jeonghanlee Sep 19, 2022
ce8fbc9
add make for debian11 github action
jeonghanlee Sep 19, 2022
60c6521
add make for debian11 github action
jeonghanlee Sep 19, 2022
a28a1ce
fixed the make exist, and update ubuntu action
jeonghanlee Sep 19, 2022
f2a2ceb
update ubuntu action
jeonghanlee Sep 19, 2022
b2026a4
add rocky8 action
jeonghanlee Sep 19, 2022
ba2d574
Update README.md
jeonghanlee Sep 19, 2022
811e460
update readme
jeonghanlee Sep 22, 2022
502297c
Merge branch 'master' of github.com:jeonghanlee/RecSync-env
jeonghanlee Sep 22, 2022
6cd995e
Initial local running on macOS
jeonghanlee Sep 23, 2022
9342597
active debian11 github
jeonghanlee Sep 23, 2022
52e3eaf
fix the shellcheck in recceiver.post shell scripts
jeonghanlee Sep 23, 2022
155e104
define clearly rs_install and src_install
jeonghanlee Sep 23, 2022
35e1ce6
add badges to README
jeonghanlee Sep 23, 2022
d10db26
Update README.md
jeonghanlee Sep 23, 2022
aec5799
update Dockerfile to use the latest alpine
jeonghanlee Sep 23, 2022
e671e14
Merge branch 'master' of github.com:jeonghanlee/RecSync-env
jeonghanlee Sep 23, 2022
abc691d
fix Dockerfile
jeonghanlee Sep 23, 2022
d408175
remove run entrypoint in Dockerfile
jeonghanlee Sep 23, 2022
2b1e355
add docker hub url into README
jeonghanlee Sep 23, 2022
18c710c
Debian 11, local and systemd
jeonghanlee Sep 25, 2022
39f0bbf
add local.status, and update readme
jeonghanlee Sep 25, 2022
de9a135
Merge branch 'master' of github.com:jeonghanlee/RecSync-env
jeonghanlee Sep 25, 2022
ac9fe60
add dep to local.run
jeonghanlee Sep 25, 2022
5d5cc1c
add local rules
jeonghanlee Sep 28, 2022
a322976
docker v2.0.0
jeonghanlee Sep 28, 2022
d8fed1e
docker image with latest one
jeonghanlee Sep 28, 2022
056e422
remove "
jeonghanlee Oct 12, 2022
ec502de
Allow PyCF git URL be different than CF github
tynanford Oct 17, 2022
d0c1bb6
Merge pull request #3 from tynanford/master
jeonghanlee Oct 27, 2022
51c3f3b
Add ability to run systemd service as user
tynanford Sep 14, 2023
1989697
Merge pull request #4 from tynanford/master
jeonghanlee Sep 19, 2023
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
Prev Previous commit
Next Next commit
update Dockerfile to use the latest alpine
jeonghanlee committed Sep 23, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit aec5799becadbacce449938a6c2c0c59bab2961b
29 changes: 9 additions & 20 deletions configure/RULES_DOCKER
Original file line number Diff line number Diff line change
@@ -1,29 +1,18 @@
.PHONY: install.docker docker.src_preinst build.docker prune.docker
.PHONY: install.docker build.docker prune.docker

# Docker internal install rule
# twisted will be installed later, so we have to keep dropin.cache in $(RS_INSTALL_LOCATION) first
# we will move it later within Dockfile
#
install.docker: docker.src_preinst
install.docker: conf
$(QUIET)$(INSTALL) -d $(RS_INSTALL_LOCATION)
$(QUIET)cp -r $(RS_SRC_PATH)/server/recceiver/ $(RS_INSTALL_LOCATION)/
$(QUIET)cp -r $(RS_SRC_PATH)/server/twisted/ $(RS_INSTALL_LOCATION)/
$(QUIET)cp -r $(PY_CF_SRC_PATH)/channelfinder/ $(RS_INSTALL_LOCATION)/
$(QUIET)$(INSTALL) -m 400 -b $(RS_SITE_TEMPLATE_PATH)/$(RS_CFG_FILE) $(RS_INSTALL_LOCATION)/
$(QUIET)$(INSTALL) -m 400 -b $(RS_SITE_TEMPLATE_PATH)/channelfinderapi.conf $(RS_INSTALL_LOCATION)/
$(QUIET)$(INSTALL) -m 755 -b $(RS_SITE_TEMPLATE_PATH)/dropin.cache $(RS_INSTALL_LOCATION)/
$(QUIET)$(INSTALL_DATA) -b $(RS_SITE_TEMPLATE_PATH)/.versions $(RS_INSTALL_LOCATION)/
# $(QUIET)chown -R $(RS_USERID):$(GROUPID) $(RS_INSTALL_LOCATION)

docker.src_preinst: src_versions
# $(QUIET)bash $(RS_SITE_TEMPLATE_PATH)/recceiver.postinst "configure" "$(RS_USERID)" "$(GROUPID)"
$(QUIET)sed -e "s:@CF_PROPERTIES@:$(CF_PROPERTIES):g" \
-e "s/@RS_ADDR_LIST@/$(RS_ADDR_LIST)/g" \
< $(RS_SITE_TEMPLATE_PATH)/$(RS_CFG_FILE_IN) > $(RS_SITE_TEMPLATE_PATH)/$(RS_CFG_FILE)
$(QUIET)sed -e "s|@CF_FULL_URL@|$(CF_FULL_URL)|g" \
-e "s:@CF_USER@:$(CF_USER):g" \
-e "s:@CF_PASSWD@:$(CF_PASSWD):g" \
< $(RS_SITE_TEMPLATE_PATH)/channelfinderapi.conf.in > $(RS_SITE_TEMPLATE_PATH)/channelfinderapi.conf
$(QUIET)cp -r $(RS_SRC_PATH)/server/recceiver $(RS_INSTALL_LOCATION)/
$(QUIET)cp -r $(RS_SRC_PATH)/server/twisted $(RS_INSTALL_LOCATION)/
$(QUIET)cp -r $(PY_CF_SRC_PATH)/channelfinder $(RS_INSTALL_LOCATION)/
$(QUIET)$(INSTALL) -m 400 -b $(RS_SITE_TEMPLATE_PATH)/$(RECSYNC_CONF) $(RS_INSTALL_LOCATION)/
$(QUIET)$(INSTALL) -m 400 -b $(RS_SITE_TEMPLATE_PATH)/$(CFAPI_CONF) $(RS_INSTALL_LOCATION)/
$(QUIET)$(INSTALL) -m 755 -b $(RS_SITE_TEMPLATE_PATH)/dropin.cache $(RS_INSTALL_LOCATION)/
$(QUIET)$(INSTALL_DATA) -b $(RS_SITE_TEMPLATE_PATH)/.versions $(RS_INSTALL_LOCATION)/

build.docker: distclean
$(QUIET) bash $(TOP)/docker/scripts/docker_builder.bash -a "RS_INSTALL_LOCATION=$(RS_INSTALL_LOCATION)" -a "CF_PORT_HTTP=$(CF_PORT)"
16 changes: 8 additions & 8 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
#
# author : Jeong Han Lee
# email : jeonghan.lee@gmail.com
# date : Wednesday, July 1 15:39:00 PDT 2020
# version : 0.0.2
# date : Thu Sep 22 21:40:08 PDT 2022
# version : 0.0.3

## builder : 28.4MB
FROM alpine:3.12 AS builder
ENV WorkPath /home/RecSyn-env

FROM alpine:3.16 AS builder
ENV WorkPath /home/RecSync-env
ARG RS_SERVER_PORT=5075
ARG RS_PORT_BROADCAST=5076
ARG RS_INSTALL_LOCATION=/opt/recsync
ARG CF_PORT_HTTP=8080
ARG RS_BIND_PORT=45722

RUN apk --no-cache add bash git make
# We can check the package availbilities through docker run -t -i --entrypoint /bin/sh alpine:3.16
RUN iapt update && apk --no-cache add bash git make tree

WORKDIR $WorkPath
COPY . .
@@ -25,7 +25,7 @@ RUN make distclean && \
make install.docker

## Multi-Stages build : 124MB (buster-slim : 166MB)
FROM alpine:3.12
FROM alpine:3.16
LABEL maintainer="Jeong Han Lee <jeonghan.lee@gmail.com>"

ARG BUILD_DATE
@@ -64,7 +64,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
## imcompatiblities in py3-requests
## RUN apk add --no-cache bash py3-twisted py3-simplejson py3-urllib3 py3-setuptools py3-requests
### Even if Python2, apk install a lot of Python3 packages, so we reduce the size only 43MB
RUN apk add --no-cache bash py-twisted py-simplejson py-urllib3 py2-setuptools py-requests tzdata
RUN apk add --no-cache bash py3-twisted py3-simplejson py3-urllib3 py3-requests py3-setuptools tzdata

WORKDIR ${RS_INSTALL_LOCATION}
COPY --from=builder $RS_INSTALL_LOCATION .