Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
epoupon committed Jul 2, 2023
2 parents 833a0a6 + 79b567d commit a4a3b23
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 43 deletions.
28 changes: 0 additions & 28 deletions .lgtm.yml

This file was deleted.

6 changes: 3 additions & 3 deletions Dockerfile-release
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ RUN \
RUN \
DIR=/tmp/wt && mkdir -p ${DIR} && cd ${DIR} && \
cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${PREFIX} -DBUILD_EXAMPLES=OFF -DENABLE_LIBWTTEST=OFF -DCONNECTOR_FCGI=OFF -DINSTALL_THEMES=OFF && \
make && \
make -j$(nproc) && \
make install

# Fileshelter
Expand All @@ -43,7 +43,7 @@ RUN \
PKG_CONFIG_PATH=/tmp/install/lib/pkgconfig CXXFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib -Wl,--rpath-link=${PREFIX}/lib" cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_PREFIX_PATH=${PREFIX} && \
LD_LIBRARY_PATH=${PREFIX}/lib VERBOSE=1 make && \
LD_LIBRARY_PATH=${PREFIX}/lib make test && \
make install && \
make install -j$(nproc) && \
mkdir -p ${PREFIX}/etc/ && \
cp conf/fileshelter.conf ${PREFIX}/etc

Expand All @@ -67,7 +67,7 @@ RUN \
rm -rf /tmp/fakeroot/share/Wt/resources/themes/default && \
rm -rf /tmp/fakeroot/share/Wt/resources/themes/polished && \
rm -rf /tmp/fakeroot/share/Wt/resources/themes/bootstrap/2 && \
rm -rf /tmp/fakeroot/share/Wt/resources/themes/bootstrap/5
rm -rf /tmp/fakeroot/share/Wt/resources/themes/bootstrap/3

## Release Stage
FROM alpine:3.17 AS release
Expand Down
18 changes: 6 additions & 12 deletions INSTALL.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- [Installation](#installation)
- [From Docker images](#from-docker-images)
- [From packages](#from-packages)
- [From Debian packages](#from-debian-packages)
- [From source](#from-source)
- [Deployment](#deployment)
- [Configuration](#configuration)
Expand All @@ -11,28 +11,22 @@
## From Docker images
Official _Docker_ images are available, please see detailed instructions at https://hub.docker.com/r/epoupon/fileshelter.

## From packages
### Debian Bullseye packages

_Bullseye_ packages are provided for _amd64_ and _armhf_ architectures.

## From Debian packages
_Bookworm_ packages are provided for _amd64_ architectures.
As root, trust the following debian package provider and add it in your list of repositories:
```sh
wget -O - https://debian.poupon.dev/apt/debian/epoupon.gpg.key | apt-key add -
echo "deb https://debian.poupon.dev/apt/debian buster main" > /etc/apt/sources.list.d/epoupon.list
wget https://debian.poupon.dev/apt/debian/epoupon.gpg -P /usr/share/keyrings
echo "deb [signed-by=/usr/share/keyrings/epoupon.gpg] https://debian.poupon.dev/apt/debian bookworm main" > /etc/apt/sources.list.d/epoupon.list
```

To install or upgrade _fileshelter_:
```sh
apt update
apt install fileshelter
```

The _fileshelter_ service is started just after the package installation, run by a dedicated _fileshelter_ system user.</br>
Please refer to [Deployment](#deployment) for further configuration options.

## From source
__Note__: this installation process and the default values of the configuration files have been written for _Debian Bullseye_. Therefore, you may have to adapt commands and/or paths in order to fit to your distribution.
__Note__: this installation process and the default values of the configuration files have been written for _Debian Bookworm_. Therefore, you may have to adapt commands and/or paths in order to fit to your distribution.
### Debian/Ubuntu dependencies
__Note__: a C++17 compiler is needed to compile _fileshelter_
```sh
Expand Down

0 comments on commit a4a3b23

Please sign in to comment.