Skip to content

Docker deployment for local testing#2520

Merged
monkeyiq merged 23 commits intofilesender:developmentfrom
sunetfreitag:development
Jan 29, 2026
Merged

Docker deployment for local testing#2520
monkeyiq merged 23 commits intofilesender:developmentfrom
sunetfreitag:development

Conversation

@sunetfreitag
Copy link
Copy Markdown
Contributor

This PR changes the scope of the provided docker example, reducing it to a simple local deployment running on http. It uses the Filesender 3.3 release, is based on a recent php-fpm image (php:8.5-fpm) and updates SimpleSAMLphp to 2.4.4. It also adds a few minor patches to the local deployment. Instructions on how to run the image have been updated in the readme file.

Copy link
Copy Markdown
Collaborator

@WebSpider WebSpider left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for working on this!

After the short mail exchange on the devlist I had started to bump versions, but this is a lot more thorough, thanks!

I do have a few remarks, please see inline.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It probably isnt a good idea to leave a certificate in a source tree. Given there is also a shell script in the same PR that recreates it, could we remove this and the private key?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please change including a complete file into including the patch to the original? This way it is better to see what actually has changed

You can then easily patch the already installed file from the tarball in the container

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please change including a complete file into including the patch to the original? This way it is better to see what actually has changed

You can then easily patch the already installed file from the tarball in the container

@WebSpider WebSpider self-assigned this Jan 27, 2026
…ia patch files; generate IdP certificate and update configuration from template; use .env file for docker and compose configuration
@sunetfreitag
Copy link
Copy Markdown
Contributor Author

I think I have addressed now most of the remarks and also improved the deployment quite a bit.

  • Use make instead of bash scripts
  • Use .env for configuration of versions and variables
  • Generate certificate and update idp configuration from template
  • Apply patches in Dockerfile instead of copying full files (limited to 3.3)
  • Updated Readme.md on how to deploy with make

You can try out the deployment by running make firstrun (run make cleanall if you want to really start from scratch)

The three patches that I have included are:

  • Init variables in AuditLog.class.php (as described in Uninitialized properties (transfer_id, file_id) in AuditLog #2519)
  • count($transfer->downloads); instead of $dlcount = $transfer->downloads; in GUI.class.php to prevent a type cast error; this has been fixed on the dev branch
  • Init variable $token to null in transfer_detail_page.php (a file that does not exist on the dev branch anymore)

The (potential) todos are listed in the Readme.md file, but I hope the current changes are okay to merge into the dev branch.

@monkeyiq
Copy link
Copy Markdown
Contributor

I have added $transfer_id = null; and protected $file_id to AuditLog so that part of the patch should no longer be needed after the next release.

@monkeyiq
Copy link
Copy Markdown
Contributor

The download count issue is fixed in development3 and so will be fixed in the next release (3.4).

a7f1316

@monkeyiq
Copy link
Copy Markdown
Contributor

It looks like the third issue for token is also fixed in developement3 now.

@monkeyiq
Copy link
Copy Markdown
Contributor

Given that 3.4 will be needed for those 3 patches to be dropped I am thinking about merging this now and we can continue with updates (particularly for the patches) as newer releases arrive.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants