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

feat: Remove kustomize config and update Dockerfile to new openshift standards #166

Merged
merged 2 commits into from
Dec 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ RUN apt-get update -qq -o Acquire::Languages=none && \
# ensure the UTC timezone is set
ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime

RUN chmod -R g+rw /opt/matrix-hedwig && chgrp -R 0 /opt/matrix-hedwig
WORKDIR /opt/matrix-hedwig
COPY --from=builder /app/target/release/matrix-hedwig /usr/local/bin/matrix-hedwig
CMD ["/usr/local/bin/matrix-hedwig"]
Expand Down
14 changes: 0 additions & 14 deletions deploy/config.properties.sample

This file was deleted.

45 changes: 0 additions & 45 deletions deploy/deployment.yaml

This file was deleted.

14 changes: 0 additions & 14 deletions deploy/kustomization.yaml

This file was deleted.

10 changes: 0 additions & 10 deletions deploy/service.yaml

This file was deleted.

7 changes: 4 additions & 3 deletions tests/pusher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
//! Tests for the pusher.

#![allow(clippy::unwrap_used)]

Expand Down Expand Up @@ -189,7 +190,7 @@ async fn run_request(
.call(
http::Request::post("/_matrix/push/v1/notify")
.header(CONTENT_TYPE, "application/json")
.header(CONTENT_LENGTH, body.as_bytes().len())
.header(CONTENT_LENGTH, body.len())
.body(Body::from(body))?,
)
.await?;
Expand Down Expand Up @@ -243,7 +244,7 @@ async fn bad_json() -> Result<(), Box<dyn std::error::Error>> {
.call(
http::Request::post("/_matrix/push/v1/notify")
.header(CONTENT_TYPE, "application/json")
.header(CONTENT_LENGTH, body.as_bytes().len())
.header(CONTENT_LENGTH, body.len())
.body(Body::from(body))?,
)
.await?;
Expand Down Expand Up @@ -273,7 +274,7 @@ async fn push_body_limit() -> Result<(), Box<dyn std::error::Error>> {
.call(
http::Request::post("/_matrix/push/v1/notify")
.header(CONTENT_TYPE, "application/json")
.header(CONTENT_LENGTH, body.as_bytes().len())
.header(CONTENT_LENGTH, body.len())
.body(Body::from(body))?,
)
.await?;
Expand Down
2 changes: 2 additions & 0 deletions tests/settings.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
//! Tests for the settings module.

#![allow(clippy::unwrap_used)]

use matrix_hedwig::settings;
Expand Down
Loading