Skip to content

Commit 1feabab

Browse files
committed
feat: the great rewrite
1 parent 5534aaa commit 1feabab

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+2712
-2239
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/local
2+
report.knit.md

database/IP2LOCATION-LITE-DB5.BIN

-7.62 MB
Binary file not shown.

docker/Dockerfile

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM debian:trixie-slim
3+
FROM jenkins/agent:latest-trixie
44

55
ENV DEBIAN_FRONTEND=noninteractive
66
ENV GNUMAKEFLAGS="-j2 --no-print-directory --output-sync=target"
77
ENV MAKEFLAGS="-j2 --no-print-directory --output-sync=target"
88
ENV RSTUDIO_PANDOC=/usr/bin
99
ENV TZ=Europe/Berlin
1010

11+
USER root
12+
13+
# Overwrite TZ from jenkins image.
14+
RUN ln -snf /usr/share/zoneinfo/"${TZ}" /etc/localtime && \
15+
echo "${TZ}" > /etc/timezone && \
16+
dpkg-reconfigure tzdata
17+
1118
SHELL ["/bin/bash", "-Eeuxo", "pipefail", "-c"]
1219

1320
COPY docker_scripts /docker_scripts
@@ -17,4 +24,13 @@ ENV EXTRA_CXXFLAGS=-w
1724
COPY config/Makevars /root/.R/Makevars
1825

1926
RUN /docker_scripts/install_apt_packages.sh
27+
28+
COPY --from=config r-requirements.txt /docker_scripts/
2029
RUN /docker_scripts/install_R_packages.R
30+
31+
COPY --from=config requirements.txt /docker_scripts/
32+
RUN pip3 install --break-system-packages -r /docker_scripts/requirements.txt
33+
34+
ARG user=jenkins
35+
RUN echo "${user} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
36+
USER "${user}"

docker/compose.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# SPDX-FileCopyrightText: 2006-2025 Knut Reinert & Freie Universität Berlin
2+
# SPDX-FileCopyrightText: 2016-2025 Knut Reinert & MPI für molekulare Genetik
3+
# SPDX-License-Identifier: CC-BY-4.0
4+
5+
services:
6+
usage-plots:
7+
image: ghcr.io/seqan/usage-plots
8+
pull_policy: never
9+
build:
10+
context: .
11+
additional_contexts:
12+
config: ../scripts/config
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
#!/usr/bin/env Rscript
22

3-
install.packages(c('ggplot2','scholar','knitr','rmarkdown','leaflet','rworldmap','lattice','RColorBrewer','sp'), repos='https://cloud.r-project.org/')
3+
initial.options <- commandArgs(trailingOnly = FALSE)
4+
script.dirname <- dirname(sub("--file=", "", initial.options[grep("--file=", initial.options)]))
5+
6+
libraries <- scan(file.path(script.dirname, "r-requirements.txt"), what="", sep="\n", quiet = TRUE)
7+
install.packages(libraries, repos='https://cloud.r-project.org/')
48
q()

docker/docker_scripts/install_apt_packages.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,17 @@ apt-get install --yes --no-install-recommends \
1010
gawk \
1111
libabsl-dev \
1212
libcairo2-dev \
13+
libfribidi-dev \
1314
libgdal-dev \
15+
libharfbuzz-dev \
1416
libpng-dev \
1517
libssl-dev \
1618
libudunits2-dev \
19+
nano \
1720
pandoc \
1821
python-is-python3 \
1922
python3 \
23+
python3-pip \
2024
r-base \
2125
r-base-dev \
2226
sshpass \

scripts/IP2Location-Python/AUTHORS

Lines changed: 0 additions & 2 deletions
This file was deleted.

scripts/IP2Location-Python/ChangeLog

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)