Skip to content

Commit

Permalink
Merge pull request #163 from dbpedia/master
Browse files Browse the repository at this point in the history
lastest changes into dev
  • Loading branch information
holycrab13 authored Jan 26, 2024
2 parents b6da4d9 + 05ac87f commit 360648f
Show file tree
Hide file tree
Showing 7 changed files with 65 additions and 23 deletions.
39 changes: 39 additions & 0 deletions .github/workflows/container_image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Build Docker image

on: [push]

jobs:
docker:
runs-on: ubuntu-22.04
steps:
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
# - name: Login to DockerHub
# uses: docker/login-action@v2
# with:
# username: ${{ secrets.DOCKERHUB_USERNAME }}
# password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v4
with:
images: |
ghcr.io/dbpedia/databus
- name: Build and push for many architectures
id: docker_build_tagged
uses: docker/build-push-action@v4
with:
push: ${{ github.event_name != 'pull_request' }}
platforms: 'linux/amd64,linux/arm64'
cache-from: type=gha
cache-to: type=gha,mode=max
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
31 changes: 15 additions & 16 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
FROM ubuntu:18.04
RUN apt-get update
RUN apt-get install -y curl
FROM ubuntu:22.04

# Set up node.js:
RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
apt-get install -y nodejs && \
node -v && \
npm -v

# Set up Caddy as proxy server:
RUN apt-get install -y debian-keyring debian-archive-keyring apt-transport-https && \
# Install node.js, Caddy as proxy server, and java.
RUN apt-get update && \
apt-get -y install curl debian-keyring debian-archive-keyring apt-transport-https && \
curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/gpg.key' | gpg --dearmor -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg && \
curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/debian.deb.txt' | tee /etc/apt/sources.list.d/caddy-stable.list && \
apt-get update && \
apt-get install caddy

RUN apt-get -y install ca-certificates-java
RUN apt-get -y install openjdk-17-jdk openjdk-17-jre
RUN java -version
apt-get -y install \
nodejs \
caddy \
ca-certificates-java \
openjdk-17-jdk \
openjdk-17-jre && \
rm -rf /var/lib/apt/lists/* && \
node -v && \
npm -v && \
java -version

# Disable the proxy server by default:
ENV DATABUS_PROXY_SERVER_ENABLE=false
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ https://raw.githubusercontent.com/dbpedia/databus/68f976e29e2db15472f1b664a6fd58
<!-- TODO change webdav link to our guide -->
ℹ️ Explanation and variants:
* Databus considers "text" as data. Data is any URI that can be accessed to retrieve bytecode. Text is normally encoded in Unicode UTF-8 bytecode.
* Data can be kept private, either by Firewall, VPN, HTTP Basic Authentication (`https://user:[email protected]`), local IPs (`127.0.0.1' or '192'), using `file://`.
* Data can be kept private, either by Firewall, VPN, HTTP Basic Authentication (`https://user:[email protected]`), local IPs ('127.0.0.1' or '192.168.x.x'), using `file://`.
* In the image above, we listed some free public storage options. Note that Databus comes with a built-in [WebDav](https://en.wikipedia.org/wiki/WebDAV) to store your data.

## Running the Server
Expand Down
2 changes: 1 addition & 1 deletion devenv/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ The `build-docker-image.sh` script will install all npm dependencies for the ser

### Starting the Databus Environment

Go to the root directory of the repository and start the database and lookup search containers
Go to the `devenv` directory of the repository and start the database and lookup search containers

```
make env-build
Expand Down
2 changes: 1 addition & 1 deletion devenv/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
version: "3.0"
services:
gstore:
image: gstore-dev #dbpedia/gstore:dev
image: dbpedia/gstore:dev #dbpedia/gstore:dev
container_name: devenv_gstore
environment:
STORAGE_USER: "dba"
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "3.0"
services:
databus:
image: "dbpedia/databus"
image: "docker.io/dbpedia/databus"
ports:
- 3000:3000 # HTTP: Databus web UI
# - 80:80 # ** uncomment if proxy enabled only** HTTP port of included proxy (caddy) necessary for Auto-HTTPS via ACME and HTTP->HTTPS redirect
Expand All @@ -28,7 +28,7 @@ services:
- ./data/tls/:/tls:ro # path for TLS (HTTPS) certs when using integrated caddy proxy
- ./data/tls/caddy:/root/.local/share/caddy/ # path for caddy settings esp. automatic TLS certificates
gstore:
image: "dbpedia/gstore"
image: "docker.io/dbpedia/gstore"
environment:
STORAGE_USER: ${VIRTUOSO_USER}
STORAGE_PASS: ${VIRTUOSO_PASSWORD}
Expand All @@ -39,7 +39,7 @@ services:
- ./data/gstore/repo:/gstore/git
- ./data/gstore/logs:/gstore/logs
virtuoso:
image: "openlink/virtuoso-opensource-7"
image: "docker.io/openlink/virtuoso-opensource-7"
environment:
DBA_PASSWORD: ${VIRTUOSO_PASSWORD}
SPARQL_UPDATE: "true"
Expand Down
6 changes: 5 additions & 1 deletion public/templates/footer.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@

<p><i>Global and Unified Access to Knowledge Graphs</i> <br/>
© Copyright 2023&nbsp;by DBpedia. All Rights Reserved.</p>
<a class="has-text-white" href="/imprint">Imprint</a> | <a target="_blank" class="has-text-white" href="https://github.com/dbpedia/databus/issues?q=is%253Aissue+is%253Aopen">Report Issue</a> | <a target="_blank" class="has-text-white" href="http://dev.dbpedia.org/Download_Data">Sparql Endpoint</a> | <a target="_blank" class="has-text-white" href="https://forum.dbpedia.org">Forum</a>
<a class="has-text-white" href="/imprint">Imprint</a>
| <a target="_blank" class="has-text-white" href="https://github.com/dbpedia/databus/issues?q=is%253Aissue+is%253Aopen">Report Issue</a>
| <a target="_blank" class="has-text-white" href="http://dev.dbpedia.org/Download_Data">Download Data</a>
| <a target="_blank" class="has-text-white" href="/sparql">SPARQL Endpoint</a>
| <a target="_blank" class="has-text-white" href="https://forum.dbpedia.org">Forum</a>

</div>
</div>
Expand Down

0 comments on commit 360648f

Please sign in to comment.